X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=e6004ae82db805611779fc44072b5e7c10088a9e;hb=bb32a23e9e4ed5b55320c7074b3eca686ef8c0c5;hp=ebcf106c7f825e5b850922819ce06472d899d229;hpb=a23790875ee20326ba0fb9d30b7719979659c2cd;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ebcf106c..e6004ae8 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -52,13 +52,16 @@ #include "kdenlive-config.h" #include "cliptranscode.h" #include "ui_templateclip_ui.h" +#include "vectorscope.h" #include #include #include #include #include +#include #include +#include #include #include #include @@ -79,8 +82,14 @@ #include #include #include +#if KDE_IS_VERSION(4,3,80) +#include +#include +#else #include #include +#define KNS3 KNS +#endif /* KDE_IS_VERSION(4,3,80) */ #include #include @@ -132,6 +141,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_timelineArea = new KTabWidget(this); m_timelineArea->setTabReorderingEnabled(true); m_timelineArea->setTabBarHidden(true); + m_timelineArea->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); + m_timelineArea->setMinimumHeight(200); QToolButton *closeTabButton = new QToolButton; connect(closeTabButton, SIGNAL(clicked()), this, SLOT(closeCurrentDocument())); @@ -150,23 +161,18 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_monitorManager = new MonitorManager(); + m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this); + connect(m_shortcutRemoveFocus, SIGNAL(activated()), this, SLOT(slotRemoveFocus())); + + + /// Add Widgets /// + m_projectListDock = new QDockWidget(i18n("Project Tree"), this); m_projectListDock->setObjectName("project_tree"); m_projectList = new ProjectList(this); m_projectListDock->setWidget(m_projectList); addDockWidget(Qt::TopDockWidgetArea, m_projectListDock); - m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this); - connect(m_shortcutRemoveFocus, SIGNAL(activated()), this, SLOT(slotRemoveFocus())); - - m_effectListDock = new QDockWidget(i18n("Effect List"), this); - m_effectListDock->setObjectName("effect_list"); - m_effectList = new EffectsListView(); - - //m_effectList = new KListWidget(this); - m_effectListDock->setWidget(m_effectList); - addDockWidget(Qt::TopDockWidgetArea, m_effectListDock); - m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this); m_effectStackDock->setObjectName("effect_stack"); m_effectStack = new EffectStackView(this); @@ -179,20 +185,11 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_transitionConfigDock->setWidget(m_transitionConfig); addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock); - KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile()); - m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection()); - readOptions(); - m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection()); - m_fileRevert->setEnabled(false); - - //slotDetectAudioDriver(); - m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); m_clipMonitorDock->setObjectName("clip_monitor"); m_clipMonitor = new Monitor("clip", m_monitorManager, QString(), this); m_clipMonitorDock->setWidget(m_clipMonitor); addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock); - //m_clipMonitor->stop(); m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); m_projectMonitorDock->setObjectName("project_monitor"); @@ -211,6 +208,19 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int))); #endif + m_effectListDock = new QDockWidget(i18n("Effect List"), this); + m_effectListDock->setObjectName("effect_list"); + m_effectList = new EffectsListView(); + m_effectListDock->setWidget(m_effectList); + addDockWidget(Qt::TopDockWidgetArea, m_effectListDock); + + m_vectorscope = new Vectorscope(m_projectMonitor->render, this); + m_vectorscopeDock = new QDockWidget(i18n("Vectorscope"), this); + m_vectorscopeDock->setObjectName("vectorscope"); + m_vectorscopeDock->setWidget(m_vectorscope); + addDockWidget(Qt::TopDockWidgetArea, m_vectorscopeDock); + + m_undoViewDock = new QDockWidget(i18n("Undo History"), this); m_undoViewDock->setObjectName("undo_history"); m_undoView = new QUndoView(this); @@ -226,22 +236,43 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent //overviewDock->setWidget(m_overView); //addDockWidget(Qt::TopDockWidgetArea, overviewDock); + setupActions(); - //tabifyDockWidget(projectListDock, effectListDock); + + /// Tabify Widgets /// tabifyDockWidget(m_projectListDock, m_effectStackDock); tabifyDockWidget(m_projectListDock, m_transitionConfigDock); - //tabifyDockWidget(projectListDock, undoViewDock); tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock); #ifndef Q_WS_MAC tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock); #endif + + tabifyDockWidget(m_vectorscopeDock, m_undoViewDock); + tabifyDockWidget(m_vectorscopeDock, m_effectListDock); + + setCentralWidget(m_timelineArea); + KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile()); + m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection()); + readOptions(); + m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection()); + m_fileRevert->setEnabled(false); + + setupGUI(); + + // Find QDockWidget tab bars and show / hide widget title bars on right click + QList tabs = findChildren(); + for (int i = 0; i < tabs.count(); i++) { + tabs.at(i)->setContextMenuPolicy(Qt::CustomContextMenu); + connect(tabs.at(i), SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(slotSwitchTitles())); + } + /*ScriptingPart* sp = new ScriptingPart(this, QStringList()); guiFactory()->addClient(sp);*/ @@ -251,19 +282,23 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_projectMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone); m_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast(factory()->container("marker_menu", this))); - m_projectList->setupGeneratorMenu(static_cast(factory()->container("generators", this)), static_cast(factory()->container("transcoders", this))); - QAction *action; + QMenu *clipInTimeline = static_cast(factory()->container("clip_in_timeline", this)); + clipInTimeline->setIcon(KIcon("go-jump")); + m_projectList->setupGeneratorMenu(static_cast(factory()->container("generators", this)), + static_cast(factory()->container("transcoders", this)), + clipInTimeline); + + KAction *action; // build themes menus QMenu *themesMenu = static_cast(factory()->container("themes_menu", this)); QActionGroup *themegroup = new QActionGroup(this); themegroup->setExclusive(true); - action = new QAction(i18n("Default"), this); + action = new KAction(i18n("Default"), this); action->setCheckable(true); themegroup->addAction(action); if (KdenliveSettings::colortheme().isEmpty()) action->setChecked(true); - const QStringList schemeFiles = KGlobal::dirs()->findAllResources("data", "color-schemes/*.colors", KStandardDirs::NoDuplicates); for (int i = 0; i < schemeFiles.size(); ++i) { @@ -276,7 +311,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent QIcon icon = createSchemePreviewIcon(config); KConfigGroup group(config, "General"); const QString name = group.readEntry("Name", info.baseName()); - action = new QAction(name, this); + action = new KAction(name, this); action->setData(filename); action->setIcon(icon); action->setCheckable(true); @@ -284,11 +319,6 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent if (KdenliveSettings::colortheme() == filename) action->setChecked(true); } - - - - - /*KGlobal::dirs()->addResourceDir("themes", KStandardDirs::installPath("data") + QString("kdenlive/themes")); QStringList themes = KGlobal::dirs()->findAllResources("themes", QString(), KStandardDirs::Recursive | KStandardDirs::NoDuplicates); for (QStringList::const_iterator it = themes.constBegin(); it != themes.constEnd(); ++it) @@ -303,94 +333,51 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent themesMenu->addActions(themegroup->actions()); connect(themesMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotChangePalette(QAction*))); - // build effects menus - QMenu *videoEffectsMenu = static_cast(factory()->container("video_effects_menu", this)); - - QStringList effectInfo; - QMap effectsList; - for (int ix = 0; ix < videoEffects.count(); ix++) { - effectInfo = videoEffects.effectIdInfo(ix); - effectsList.insert(effectInfo.at(0).toLower(), effectInfo); - } - - foreach(const QStringList &value, effectsList) { - action = new QAction(value.at(0), this); - action->setData(value); - videoEffectsMenu->addAction(action); - } - - QMenu *audioEffectsMenu = static_cast(factory()->container("audio_effects_menu", this)); - - - effectsList.clear(); - for (int ix = 0; ix < audioEffects.count(); ix++) { - effectInfo = audioEffects.effectIdInfo(ix); - effectsList.insert(effectInfo.at(0).toLower(), effectInfo); - } - - foreach(const QStringList &value, effectsList) { - action = new QAction(value.at(0), this); - action->setData(value); - audioEffectsMenu->addAction(action); - } - + // Setup and fill effects and transitions menus. + m_videoEffectsMenu = static_cast(factory()->container("video_effects_menu", this)); + for (int i = 0; i < videoEffects.count(); ++i) + m_videoEffectsMenu->addAction(m_videoEffects[i]); + m_audioEffectsMenu = static_cast(factory()->container("audio_effects_menu", this)); + for (int i = 0; i < audioEffects.count(); ++i) + m_audioEffectsMenu->addAction(m_audioEffects[i]); m_customEffectsMenu = static_cast(factory()->container("custom_effects_menu", this)); - - if (customEffects.isEmpty()) m_customEffectsMenu->setEnabled(false); - else m_customEffectsMenu->setEnabled(true); - - effectsList.clear(); - for (int ix = 0; ix < customEffects.count(); ix++) { - effectInfo = customEffects.effectIdInfo(ix); - effectsList.insert(effectInfo.at(0).toLower(), effectInfo); - } - - foreach(const QStringList &value, effectsList) { - action = new QAction(value.at(0), this); - action->setData(value); - m_customEffectsMenu->addAction(action); - } + if (customEffects.isEmpty()) + m_customEffectsMenu->setEnabled(false); + else + m_customEffectsMenu->setEnabled(true); + for (int i = 0; i < customEffects.count(); ++i) + m_customEffectsMenu->addAction(m_customEffects[i]); + m_transitionsMenu = new QMenu(i18n("Add Transition"), this); + for (int i = 0; i < transitions.count(); ++i) + m_transitionsMenu->addAction(m_transitions[i]); + + connect(m_videoEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *))); + connect(m_audioEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddAudioEffect(QAction *))); + connect(m_customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *))); + connect(m_transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *))); QMenu *newEffect = new QMenu(this); - newEffect->addMenu(videoEffectsMenu); - newEffect->addMenu(audioEffectsMenu); + newEffect->addMenu(m_videoEffectsMenu); + newEffect->addMenu(m_audioEffectsMenu); newEffect->addMenu(m_customEffectsMenu); m_effectStack->setMenu(newEffect); - QMenu *viewMenu = static_cast(factory()->container("dockwindows", this)); const QList viewActions = createPopupMenu()->actions(); viewMenu->insertActions(NULL, viewActions); - connect(videoEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *))); - connect(audioEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddAudioEffect(QAction *))); - connect(m_customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *))); - m_timelineContextMenu = new QMenu(this); m_timelineContextClipMenu = new QMenu(this); m_timelineContextTransitionMenu = new QMenu(this); - - QMenu *transitionsMenu = new QMenu(i18n("Add Transition"), this); - QStringList effects = transitions.effectNames(); - - effectsList.clear(); - for (int ix = 0; ix < transitions.count(); ix++) { - effectInfo = transitions.effectIdInfo(ix); - effectsList.insert(effectInfo.at(0).toLower(), effectInfo); - } - foreach(const QStringList &value, effectsList) { - action = new QAction(value.at(0), this); - action->setData(value); - transitionsMenu->addAction(action); - } - connect(transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *))); - m_timelineContextMenu->addAction(actionCollection()->action("insert_space")); m_timelineContextMenu->addAction(actionCollection()->action("delete_space")); m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste))); - m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip")); + m_timelineContextClipMenu->addAction(actionCollection()->action("clip_in_project_tree")); + //m_timelineContextClipMenu->addAction(actionCollection()->action("clip_to_project_tree")); + m_timelineContextClipMenu->addAction(actionCollection()->action("edit_item_duration")); + m_timelineContextClipMenu->addAction(actionCollection()->action("delete_item")); m_timelineContextClipMenu->addAction(actionCollection()->action("group_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip")); @@ -400,13 +387,14 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this)); m_timelineContextClipMenu->addMenu(markersMenu); - m_timelineContextClipMenu->addMenu(transitionsMenu); - m_timelineContextClipMenu->addMenu(videoEffectsMenu); - m_timelineContextClipMenu->addMenu(audioEffectsMenu); + m_timelineContextClipMenu->addMenu(m_transitionsMenu); + m_timelineContextClipMenu->addMenu(m_videoEffectsMenu); + m_timelineContextClipMenu->addMenu(m_audioEffectsMenu); //TODO: re-enable custom effects menu when it is implemented m_timelineContextClipMenu->addMenu(m_customEffectsMenu); - m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip")); + m_timelineContextTransitionMenu->addAction(actionCollection()->action("edit_item_duration")); + m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_item")); m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); m_timelineContextTransitionMenu->addAction(actionCollection()->action("auto_transition")); @@ -421,6 +409,9 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor); slotConnectMonitors(); + // Disable drop B frames, see Kdenlive issue #1330, see also kdenlivesettingsdialog.cpp + KdenliveSettings::setDropbframes(false); + // Open or create a file. Command line argument passed in Url has // precedence, then "openlastproject", then just a plain empty file. // If opening Url fails, openlastproject will _not_ be used. @@ -480,7 +471,10 @@ bool MainWindow::queryClose() } saveOptions(); if (m_monitorManager) m_monitorManager->stopActiveMonitor(); - if (m_activeDocument && m_activeDocument->isModified()) { + // warn the user to save if document is modified and we have clips in our project list + if (m_activeDocument && m_activeDocument->isModified() && + ((m_projectList->documentClipList().isEmpty() && !m_activeDocument->url().isEmpty()) || + !m_projectList->documentClipList().isEmpty())) { switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { case KMessageBox::Yes : // save document here. If saving fails, return false; @@ -496,29 +490,36 @@ bool MainWindow::queryClose() return true; } - void MainWindow::loadPlugins() { - foreach(QObject *plugin, QPluginLoader::staticInstances()) - populateMenus(plugin); + foreach(QObject *plugin, QPluginLoader::staticInstances()) { + populateMenus(plugin); + } QStringList directories = KGlobal::dirs()->findDirs("module", QString()); QStringList filters; filters << "libkdenlive*"; foreach(const QString &folder, directories) { - kDebug() << "// PARSING FIOLER: " << folder; + kDebug() << "Parsing plugin folder: " << folder; QDir pluginsDir(folder); - foreach(const QString &fileName, pluginsDir.entryList(filters, QDir::Files)) { - kDebug() << "// FOUND PLUGIN: " << fileName << "= " << pluginsDir.absoluteFilePath(fileName); - QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); - QObject *plugin = loader.instance(); - if (plugin) { - populateMenus(plugin); - m_pluginFileNames += fileName; - } else kDebug() << "// ERROR LOADING PLUGIN: " << fileName << ", " << loader.errorString(); + foreach(const QString &fileName, + pluginsDir.entryList(filters, QDir::Files)) { + /* + * Avoid loading the same plugin twice when there is more than one + * installation. + */ + if (!m_pluginFileNames.contains(fileName)) { + kDebug() << "Found plugin: " << fileName; + QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); + QObject *plugin = loader.instance(); + if (plugin) { + populateMenus(plugin); + m_pluginFileNames += fileName; + } else + kDebug() << "Error loading plugin: " << fileName << ", " << loader.errorString(); + } } } - //exit(1); } void MainWindow::populateMenus(QObject *plugin) @@ -560,7 +561,8 @@ void MainWindow::generateClip() QAction *action = qobject_cast(sender()); ClipGenerator *iGenerator = qobject_cast(action->parent()); - KUrl clipUrl = iGenerator->generatedClip(action->data().toString(), m_activeDocument->projectFolder(), QStringList(), QStringList(), 25, 720, 576); + KUrl clipUrl = iGenerator->generatedClip(action->data().toString(), m_activeDocument->projectFolder(), + QStringList(), QStringList(), m_activeDocument->fps(), m_activeDocument->width(), m_activeDocument->height()); if (!clipUrl.isEmpty()) { m_projectList->slotAddClip(QList () << clipUrl); } @@ -584,19 +586,23 @@ void MainWindow::readProperties(const KConfigGroup &config) void MainWindow::slotReloadEffects() { - kDebug() << "START RELOAD; COUNR: " << m_customEffectsMenu->actions().count(); m_customEffectsMenu->clear(); - kDebug() << "START RELOAD; CLR: " << m_customEffectsMenu->actions().count(); initEffects::parseCustomEffectsFile(); - const QStringList effects = customEffects.effectNames(); - kDebug() << "NEW EFFS: " << effects; QAction *action; - if (effects.isEmpty()) m_customEffectsMenu->setEnabled(false); - else m_customEffectsMenu->setEnabled(true); + QStringList effectInfo; + QMap effectsList; + for (int ix = 0; ix < customEffects.count(); ix++) { + effectInfo = customEffects.effectIdInfo(ix); + effectsList.insert(effectInfo.at(0).toLower(), effectInfo); + } + if (effectsList.isEmpty()) + m_customEffectsMenu->setEnabled(false); + else + m_customEffectsMenu->setEnabled(true); - foreach(const QString &name, effects) { - action = new QAction(name, this); - action->setData(name); + foreach(const QStringList &value, effectsList) { + action = new QAction(value.at(0), this); + action->setData(value); m_customEffectsMenu->addAction(action); } m_effectList->reloadEffectList(); @@ -688,11 +694,12 @@ void MainWindow::slotUpdateClip(const QString &id) void MainWindow::slotConnectMonitors() { - m_projectList->setRenderer(m_projectMonitor->render); //connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &))); + connect(m_projectList, SIGNAL(deleteProjectClips(QStringList, QMap)), this, SLOT(slotDeleteProjectClips(QStringList, QMap))); connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *))); - connect(m_projectList, SIGNAL(getFileProperties(const QDomElement, const QString &, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement, const QString &, bool))); + connect(m_projectList, SIGNAL(showClipProperties(QList , QMap)), this, SLOT(slotShowClipProperties(QList , QMap))); + connect(m_projectList, SIGNAL(getFileProperties(const QDomElement, const QString &, int, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement, const QString &, int, bool))); connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &))); connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool))); @@ -741,35 +748,36 @@ void MainWindow::setupActions() toolbar->setMovable(false); statusBar()->setStyleSheet(QString("QStatusBar QLabel {font-size:%1pt;} QStatusBar::item { border: 0px; font-size:%1pt;padding:0px; }").arg(statusBar()->font().pointSize())); QString style1 = "QToolBar { border: 0px } QToolButton { border-style: inset; border:1px solid #999999;border-radius: 3px;margin: 0px 3px;padding: 0px;} QToolButton:checked { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}"; - - // create edit mode buttons - KAction *normaledit = new KAction(KIcon("kdenlive-normal-edit"), i18n("Normal mode"), this); - normaledit->setShortcut(i18nc("Normal editing", "n")); - toolbar->addAction(normaledit); - normaledit->setCheckable(true); - normaledit->setChecked(true); - - m_overwriteModeTool = new KAction(KIcon("kdenlive-overwrite-edit"), i18n("Overwrite mode"), this); - m_overwriteModeTool->setShortcut(i18nc("Overwrite mode shortcut", "o")); - toolbar->addAction(m_overwriteModeTool); - m_overwriteModeTool->setCheckable(true); - m_overwriteModeTool->setChecked(false); - - m_insertModeTool = new KAction(KIcon("kdenlive-insert-edit"), i18n("Insert mode"), this); - m_insertModeTool->setShortcut(i18nc("Insert mode shortcut", "i")); - toolbar->addAction(m_insertModeTool); - m_insertModeTool->setCheckable(true); - m_insertModeTool->setChecked(false); + QString styleBorderless = "QToolButton { border-width: 0px;margin: 1px 3px 0px;padding: 0px;}"; + + //create edit mode buttons + m_normalEditTool = new KAction(KIcon("kdenlive-normal-edit"), i18n("Normal mode"), this); + m_normalEditTool->setShortcut(i18nc("Normal editing", "n")); + toolbar->addAction(m_normalEditTool); + m_normalEditTool->setCheckable(true); + m_normalEditTool->setChecked(true); + + m_overwriteEditTool = new KAction(KIcon("kdenlive-overwrite-edit"), i18n("Overwrite mode"), this); + //m_overwriteEditTool->setShortcut(i18nc("Overwrite mode shortcut", "o")); + toolbar->addAction(m_overwriteEditTool); + m_overwriteEditTool->setCheckable(true); + m_overwriteEditTool->setChecked(false); + + m_insertEditTool = new KAction(KIcon("kdenlive-insert-edit"), i18n("Insert mode"), this); + //m_insertEditTool->setShortcut(i18nc("Insert mode shortcut", "i")); + toolbar->addAction(m_insertEditTool); + m_insertEditTool->setCheckable(true); + m_insertEditTool->setChecked(false); // not implemented yet - m_insertModeTool->setEnabled(false); + m_insertEditTool->setEnabled(false); QActionGroup *editGroup = new QActionGroup(this); - editGroup->addAction(normaledit); - editGroup->addAction(m_overwriteModeTool); - editGroup->addAction(m_insertModeTool); + editGroup->addAction(m_normalEditTool); + editGroup->addAction(m_overwriteEditTool); + editGroup->addAction(m_insertEditTool); editGroup->setExclusive(true); connect(editGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeEdit(QAction *))); - //connect(m_overwriteModeTool, SIGNAL(toggled(bool)), this, SLOT(slotSetOverwriteMode(bool))); + //connect(m_overwriteEditTool, SIGNAL(toggled(bool)), this, SLOT(slotSetOverwriteMode(bool))); toolbar->addSeparator(); @@ -801,15 +809,15 @@ void MainWindow::setupActions() QWidget * actionWidget; int max = toolbar->iconSizeDefault() + 2; - actionWidget = toolbar->widgetForAction(normaledit); + actionWidget = toolbar->widgetForAction(m_normalEditTool); actionWidget->setMaximumWidth(max); actionWidget->setMaximumHeight(max - 4); - actionWidget = toolbar->widgetForAction(m_insertModeTool); + actionWidget = toolbar->widgetForAction(m_insertEditTool); actionWidget->setMaximumWidth(max); actionWidget->setMaximumHeight(max - 4); - actionWidget = toolbar->widgetForAction(m_overwriteModeTool); + actionWidget = toolbar->widgetForAction(m_overwriteEditTool); actionWidget->setMaximumWidth(max); actionWidget->setMaximumHeight(max - 4); @@ -832,20 +840,54 @@ void MainWindow::setupActions() m_buttonFitZoom = new KAction(KIcon("zoom-fit-best"), i18n("Fit zoom to project"), this); toolbar->addAction(m_buttonFitZoom); m_buttonFitZoom->setCheckable(false); - connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom())); - actionWidget = toolbar->widgetForAction(m_buttonFitZoom); - actionWidget->setMaximumWidth(max); - actionWidget->setMaximumHeight(max - 4); + m_zoomOut = new KAction(KIcon("zoom-out"), i18n("Zoom Out"), this); + toolbar->addAction(m_zoomOut); + m_zoomOut->setShortcut(Qt::CTRL + Qt::Key_Minus); m_zoomSlider = new QSlider(Qt::Horizontal, this); m_zoomSlider->setMaximum(13); m_zoomSlider->setPageStep(1); + m_zoomSlider->setInvertedAppearance(true); m_zoomSlider->setMaximumWidth(150); m_zoomSlider->setMinimumWidth(100); toolbar->addWidget(m_zoomSlider); + m_zoomIn = new KAction(KIcon("zoom-in"), i18n("Zoom In"), this); + toolbar->addAction(m_zoomIn); + m_zoomIn->setShortcut(Qt::CTRL + Qt::Key_Plus); + + actionWidget = toolbar->widgetForAction(m_buttonFitZoom); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + actionWidget->setStyleSheet(styleBorderless); + + actionWidget = toolbar->widgetForAction(m_zoomIn); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + actionWidget->setStyleSheet(styleBorderless); + + actionWidget = toolbar->widgetForAction(m_zoomOut); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + actionWidget->setStyleSheet(styleBorderless); + + connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSetZoom(int))); + connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(slotShowZoomSliderToolTip(int))); + connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom())); + connect(m_zoomIn, SIGNAL(triggered(bool)), this, SLOT(slotZoomIn())); + connect(m_zoomOut, SIGNAL(triggered(bool)), this, SLOT(slotZoomOut())); + + toolbar->addSeparator(); + + //create automatic audio split button + m_buttonAutomaticSplitAudio = new KAction(KIcon("kdenlive-split-audio"), i18n("Split audio and video automatically"), this); + toolbar->addAction(m_buttonAutomaticSplitAudio); + m_buttonAutomaticSplitAudio->setCheckable(true); + m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio()); + connect(m_buttonAutomaticSplitAudio, SIGNAL(triggered()), this, SLOT(slotSwitchSplitAudio())); + m_buttonVideoThumbs = new KAction(KIcon("kdenlive-show-videothumb"), i18n("Show video thumbnails"), this); toolbar->addAction(m_buttonVideoThumbs); m_buttonVideoThumbs->setCheckable(true); @@ -870,6 +912,10 @@ void MainWindow::setupActions() m_buttonSnap->setChecked(KdenliveSettings::snaptopoints()); connect(m_buttonSnap, SIGNAL(triggered()), this, SLOT(slotSwitchSnap())); + actionWidget = toolbar->widgetForAction(m_buttonAutomaticSplitAudio); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs); actionWidget->setMaximumWidth(max); actionWidget->setMaximumHeight(max - 4); @@ -896,28 +942,21 @@ void MainWindow::setupActions() statusBar()->addPermanentWidget(m_timecodeFormat); //statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 3); - collection->addAction("normal_mode", normaledit); - collection->addAction("overwrite_mode", m_overwriteModeTool); - collection->addAction("insert_mode", m_insertModeTool); + collection->addAction("normal_mode", m_normalEditTool); + collection->addAction("overwrite_mode", m_overwriteEditTool); + collection->addAction("insert_mode", m_insertEditTool); collection->addAction("select_tool", m_buttonSelectTool); collection->addAction("razor_tool", m_buttonRazorTool); collection->addAction("spacer_tool", m_buttonSpacerTool); + collection->addAction("automatic_split_audio", m_buttonAutomaticSplitAudio); collection->addAction("show_video_thumbs", m_buttonVideoThumbs); collection->addAction("show_audio_thumbs", m_buttonAudioThumbs); collection->addAction("show_markers", m_buttonShowMarkers); collection->addAction("snap", m_buttonSnap); collection->addAction("zoom_fit", m_buttonFitZoom); - - KAction* zoomIn = new KAction(KIcon("zoom-in"), i18n("Zoom In"), this); - collection->addAction("zoom_in", zoomIn); - connect(zoomIn, SIGNAL(triggered(bool)), this, SLOT(slotZoomIn())); - zoomIn->setShortcut(Qt::CTRL + Qt::Key_Plus); - - KAction* zoomOut = new KAction(KIcon("zoom-out"), i18n("Zoom Out"), this); - collection->addAction("zoom_out", zoomOut); - connect(zoomOut, SIGNAL(triggered(bool)), this, SLOT(slotZoomOut())); - zoomOut->setShortcut(Qt::CTRL + Qt::Key_Minus); + collection->addAction("zoom_in", m_zoomIn); + collection->addAction("zoom_out", m_zoomOut); m_projectSearch = new KAction(KIcon("edit-find"), i18n("Find"), this); collection->addAction("project_find", m_projectSearch); @@ -934,11 +973,10 @@ void MainWindow::setupActions() collection->addAction("manage_profiles", profilesAction); connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles())); - KNS::standardAction(i18n("Download New Wipes..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas"); - - KNS::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles"); - - KNS::standardAction(i18n("Download New Project Profiles..."), this, SLOT(slotGetNewMltProfileStuff()), actionCollection(), "get_new_mlt_profiles"); + KNS3::standardAction(i18n("Download New Wipes..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas"); + KNS3::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles"); + KNS3::standardAction(i18n("Download New Project Profiles..."), this, SLOT(slotGetNewMltProfileStuff()), actionCollection(), "get_new_mlt_profiles"); + KNS3::standardAction(i18n("Download New Title Templates..."), this, SLOT(slotGetNewTitleStuff()), actionCollection(), "get_new_titles"); KAction* wizAction = new KAction(KIcon("configure"), i18n("Run Config Wizard"), this); collection->addAction("run_wizard", wizAction); @@ -993,6 +1031,21 @@ void MainWindow::setupActions() markOut->setShortcut(Qt::Key_O); connect(markOut, SIGNAL(triggered(bool)), this, SLOT(slotSetOutPoint())); + KAction *switchMon = collection->addAction("switch_monitor"); + switchMon->setText(i18n("Switch monitor")); + switchMon->setShortcut(Qt::Key_T); + connect(switchMon, SIGNAL(triggered(bool)), this, SLOT(slotSwitchMonitors())); + + KAction *insertTree = collection->addAction("insert_project_tree"); + insertTree->setText(i18n("Insert zone in project tree")); + insertTree->setShortcut(Qt::CTRL + Qt::Key_I); + connect(insertTree, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTree())); + + KAction *insertTimeline = collection->addAction("insert_timeline"); + insertTimeline->setText(i18n("Insert zone in timeline")); + insertTimeline->setShortcut(Qt::SHIFT + Qt::CTRL + Qt::Key_I); + connect(insertTimeline, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTimeline())); + KAction *resizeStart = new KAction(KIcon(), i18n("Resize Item Start"), this); collection->addAction("resize_timeline_clip_start", resizeStart); resizeStart->setShortcut(Qt::Key_1); @@ -1073,10 +1126,10 @@ void MainWindow::setupActions() collection->addAction("monitor_seek_snap_forward", monitorSeekSnapForward); connect(monitorSeekSnapForward, SIGNAL(triggered(bool)), this, SLOT(slotSnapForward())); - KAction* deleteTimelineClip = new KAction(KIcon("edit-delete"), i18n("Delete Selected Item"), this); - deleteTimelineClip->setShortcut(Qt::Key_Delete); - collection->addAction("delete_timeline_clip", deleteTimelineClip); - connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip())); + KAction* deleteItem = new KAction(KIcon("edit-delete"), i18n("Delete Selected Item"), this); + deleteItem->setShortcut(Qt::Key_Delete); + collection->addAction("delete_timeline_clip", deleteItem); + connect(deleteItem, SIGNAL(triggered(bool)), this, SLOT(slotDeleteItem())); /*KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this); collection->addAction("change_clip_speed", editTimelineClipSpeed); @@ -1101,6 +1154,18 @@ void MainWindow::setupActions() ungroupClip->setData("ungroup_clip"); connect(ungroupClip, SIGNAL(triggered(bool)), this, SLOT(slotUnGroupClips())); + KAction* editItemDuration = new KAction(KIcon("measure"), i18n("Edit Duration"), this); + collection->addAction("edit_item_duration", editItemDuration); + connect(editItemDuration, SIGNAL(triggered(bool)), this, SLOT(slotEditItemDuration())); + + KAction* clipInProjectTree = new KAction(KIcon("go-jump-definition"), i18n("Clip in Project Tree"), this); + collection->addAction("clip_in_project_tree", clipInProjectTree); + connect(clipInProjectTree, SIGNAL(triggered(bool)), this, SLOT(slotClipInProjectTree())); + + /*KAction* clipToProjectTree = new KAction(KIcon("go-jump-definition"), i18n("Add Clip to Project Tree"), this); + collection->addAction("clip_to_project_tree", clipToProjectTree); + connect(clipToProjectTree, SIGNAL(triggered(bool)), this, SLOT(slotClipToProjectTree()));*/ + KAction* insertOvertwrite = new KAction(KIcon(), i18n("Insert Clip Zone in Timeline (Overwrite)"), this); insertOvertwrite->setShortcut(Qt::Key_V); collection->addAction("overwrite_to_in_point", insertOvertwrite); @@ -1199,9 +1264,9 @@ void MainWindow::setupActions() collection->addAction("delete_track", deleteTrack); connect(deleteTrack, SIGNAL(triggered()), this, SLOT(slotDeleteTrack())); - KAction *changeTrack = new KAction(KIcon(), i18n("Change Track"), this); - collection->addAction("change_track", changeTrack); - connect(changeTrack, SIGNAL(triggered()), this, SLOT(slotChangeTrack())); + KAction *configTracks = new KAction(KIcon("configure"), i18n("Configure Tracks"), this); + collection->addAction("config_tracks", configTracks); + connect(configTracks, SIGNAL(triggered()), this, SLOT(slotConfigTrack())); KAction *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this); collection->addAction("add_guide", addGuide); @@ -1230,32 +1295,32 @@ void MainWindow::setupActions() showTimeline->setChecked(true); connect(showTimeline, SIGNAL(triggered(bool)), this, SLOT(slotShowTimeline(bool))); + QAction *showTitleBar = new KAction(i18n("Show Title Bars"), this); + collection->addAction("show_titlebars", showTitleBar); + showTitleBar->setCheckable(true); + connect(showTitleBar, SIGNAL(triggered(bool)), this, SLOT(slotShowTitleBars(bool))); + showTitleBar->setChecked(KdenliveSettings::showtitlebars()); + slotShowTitleBars(KdenliveSettings::showtitlebars()); + /*QAction *maxCurrent = new KAction(i18n("Maximize Current Widget"), this); collection->addAction("maximize_current", maxCurrent); maxCurrent->setCheckable(true); maxCurrent->setChecked(false); connect(maxCurrent, SIGNAL(triggered(bool)), this, SLOT(slotMaximizeCurrent(bool)));*/ - - m_closeAction = KStandardAction::close(this, SLOT(closeCurrentDocument()), collection); - - KStandardAction::quit(this, SLOT(queryQuit()), collection); - - KStandardAction::open(this, SLOT(openFile()), collection); - - m_saveAction = KStandardAction::save(this, SLOT(saveFile()), collection); - - KStandardAction::saveAs(this, SLOT(saveFileAs()), collection); - - KStandardAction::openNew(this, SLOT(newFile()), collection); - - KStandardAction::preferences(this, SLOT(slotPreferences()), collection); - - KStandardAction::configureNotifications(this , SLOT(configureNotifications()), collection); - - KStandardAction::copy(this, SLOT(slotCopy()), collection); - - KStandardAction::paste(this, SLOT(slotPaste()), collection); + m_closeAction = KStandardAction::close(this, SLOT(closeCurrentDocument()), collection); + KStandardAction::quit(this, SLOT(queryQuit()), collection); + KStandardAction::open(this, SLOT(openFile()), collection); + m_saveAction = KStandardAction::save(this, SLOT(saveFile()), collection); + KStandardAction::saveAs(this, SLOT(saveFileAs()), collection); + KStandardAction::openNew(this, SLOT(newFile()), collection); + // TODO: make the following connection to slotEditKeys work + KStandardAction::keyBindings(this, SLOT(slotEditKeys()), collection); + KStandardAction::preferences(this, SLOT(slotPreferences()), collection); + KStandardAction::configureNotifications(this, SLOT(configureNotifications()), collection); + KStandardAction::copy(this, SLOT(slotCopy()), collection); + KStandardAction::paste(this, SLOT(slotPaste()), collection); + KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection); KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()), collection); undo->setEnabled(false); @@ -1265,8 +1330,6 @@ void MainWindow::setupActions() redo->setEnabled(false); connect(m_commandStack, SIGNAL(canRedoChanged(bool)), redo, SLOT(setEnabled(bool))); - KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection); - /* //TODO: Add status tooltip to actions ? connect(collection, SIGNAL(actionHovered(QAction*)), @@ -1335,6 +1398,50 @@ void MainWindow::setupActions() addClips->addAction(deleteClip); m_projectList->setupMenu(addClips, addClip); + // Setup effects and transitions actions. + m_effectsActionCollection = new KActionCollection(this, KGlobal::mainComponent()); + //KActionCategory *videoEffectActions = new KActionCategory(i18n("Video Effects"), m_effectsActionCollection); + KActionCategory *videoEffectActions = new KActionCategory(i18n("Video Effects"), collection); + m_videoEffects = new KAction*[videoEffects.count()]; + for (int i = 0; i < videoEffects.count(); ++i) { + QStringList effectInfo = videoEffects.effectIdInfo(i); + m_videoEffects[i] = new KAction(KIcon("kdenlive-show-video"), effectInfo.at(0), this); + m_videoEffects[i]->setData(effectInfo); + m_videoEffects[i]->setIconVisibleInMenu(false); + videoEffectActions->addAction("video_effect_" + effectInfo.at(0), m_videoEffects[i]); + } + //KActionCategory *audioEffectActions = new KActionCategory(i18n("Audio Effects"), m_effectsActionCollection); + KActionCategory *audioEffectActions = new KActionCategory(i18n("Audio Effects"), collection); + m_audioEffects = new KAction*[audioEffects.count()]; + for (int i = 0; i < audioEffects.count(); ++i) { + QStringList effectInfo = audioEffects.effectIdInfo(i); + m_audioEffects[i] = new KAction(KIcon("kdenlive-show-audio"), effectInfo.at(0), this); + m_audioEffects[i]->setData(effectInfo); + m_audioEffects[i]->setIconVisibleInMenu(false); + audioEffectActions->addAction("audio_effect_" + effectInfo.at(0), m_audioEffects[i]); + } + //KActionCategory *customEffectActions = new KActionCategory(i18n("Custom Effects"), m_effectsActionCollection); + KActionCategory *customEffectActions = new KActionCategory(i18n("Custom Effects"), collection); + m_customEffects = new KAction*[customEffects.count()]; + for (int i = 0; i < customEffects.count(); ++i) { + QStringList effectInfo = customEffects.effectIdInfo(i); + m_customEffects[i] = new KAction(KIcon("kdenlive-custom-effect"), effectInfo.at(0), this); + m_customEffects[i]->setData(effectInfo); + m_customEffects[i]->setIconVisibleInMenu(false); + customEffectActions->addAction("custom_effect_" + effectInfo.at(0), m_customEffects[i]); + } + //KActionCategory *transitionActions = new KActionCategory(i18n("Transitions"), m_effectsActionCollection); + KActionCategory *transitionActions = new KActionCategory(i18n("Transitions"), collection); + m_transitions = new KAction*[transitions.count()]; + for (int i = 0; i < transitions.count(); i++) { + QStringList effectInfo = transitions.effectIdInfo(i); + m_transitions[i] = new KAction(effectInfo.at(0), this); + m_transitions[i]->setData(effectInfo); + m_transitions[i]->setIconVisibleInMenu(false); + transitionActions->addAction("transition_" + effectInfo.at(0), m_transitions[i]); + } + m_effectsActionCollection->readSettings(); + //connect(collection, SIGNAL( clearStatusText() ), //statusBar(), SLOT( clear() ) ); } @@ -1403,14 +1510,14 @@ void MainWindow::slotRunWizard() delete w; } -void MainWindow::newFile(bool showProjectSettings) +void MainWindow::newFile(bool showProjectSettings, bool force) { - if (!m_timelineArea->isEnabled()) return; + if (!m_timelineArea->isEnabled() && !force) return; m_fileRevert->setEnabled(false); QString profileName; KUrl projectFolder; QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); - if (!showProjectSettings && m_timelineArea->count() == 0) { + if (!showProjectSettings) { if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); profileName = KdenliveSettings::default_profile(); projectFolder = KdenliveSettings::defaultprojectfolder(); @@ -1418,15 +1525,15 @@ void MainWindow::newFile(bool showProjectSettings) ProjectSettings *w = new ProjectSettings(NULL, QStringList(), projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this); if (w->exec() != QDialog::Accepted) return; if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); - KdenliveSettings::setVideothumbnails(w->enableVideoThumbs()); - m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); - KdenliveSettings::setAudiothumbnails(w->enableAudioThumbs()); - m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); + if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs(); + if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs(); profileName = w->selectedProfile(); projectFolder = w->selectedFolder(); projectTracks = w->tracks(); delete w; } + m_timelineArea->setEnabled(true); + m_projectList->setEnabled(true); KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this); doc->m_autosave = new KAutoSaveFile(KUrl(), doc); bool ok; @@ -1434,9 +1541,8 @@ void MainWindow::newFile(bool showProjectSettings) m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description()); if (!ok) { // MLT is broken - m_timelineArea->setEnabled(false); - m_projectList->setEnabled(false); - m_monitorManager->slotBlockMonitors(); + //m_timelineArea->setEnabled(false); + //m_projectList->setEnabled(false); slotPreferences(6); return; } @@ -1444,6 +1550,7 @@ void MainWindow::newFile(bool showProjectSettings) connectDocumentInfo(doc); connectDocument(trackView, doc); } else m_timelineArea->setTabBarHidden(false); + m_monitorManager->activateMonitor("clip"); m_closeAction->setEnabled(m_timelineArea->count() > 1); } @@ -1479,6 +1586,7 @@ void MainWindow::closeCurrentDocument(bool saveChanges) break; } } + m_clipMonitor->slotSetXml(NULL); m_timelineArea->removeTab(m_timelineArea->indexOf(w)); if (m_timelineArea->count() == 1) { m_timelineArea->setTabBarHidden(true); @@ -1499,6 +1607,7 @@ void MainWindow::closeCurrentDocument(bool saveChanges) bool MainWindow::saveFileAs(const QString &outputFileName) { QString currentSceneList; + m_monitorManager->stopActiveMonitor(); if (KdenliveSettings::dropbframes()) { KdenliveSettings::setDropbframes(false); m_activeDocument->clipManager()->updatePreviewSettings(); @@ -1527,15 +1636,12 @@ bool MainWindow::saveFileAs(const QString &outputFileName) bool MainWindow::saveFileAs() { - // Check that the Kdenlive mime type is correctly installed - QString mimetype = "application/x-kdenlive"; - KMimeType::Ptr mime = KMimeType::mimeType(mimetype); - if (!mime) mimetype = "*.kdenlive"; - - QString outputFile = KFileDialog::getSaveFileName(KUrl(), mimetype); + QString outputFile = KFileDialog::getSaveFileName(KUrl(), getMimeType()); if (outputFile.isEmpty()) return false; if (QFile::exists(outputFile)) { - if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return false; + // Show the file dialog again if the user does not want to overwrite the file + if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) + return saveFileAs(); } return saveFileAs(outputFile); } @@ -1559,12 +1665,7 @@ void MainWindow::openFile() m_startUrl = KUrl(); return; } - // Check that the Kdenlive mime type is correctly installed - QString mimetype = "application/x-kdenlive"; - KMimeType::Ptr mime = KMimeType::mimeType(mimetype); - if (!mime) mimetype = "*.kdenlive"; - - KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), mimetype); + KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), getMimeType()); if (url.isEmpty()) return; m_fileOpenRecent->addUrl(url); openFile(url); @@ -1617,7 +1718,7 @@ void MainWindow::openFile(const KUrl &url) } if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); m_messageLabel->setMessage(i18n("Opening file %1", url.path()), InformationMessage); - qApp->processEvents(); + m_messageLabel->repaint(); doOpenFile(url, NULL); } @@ -1642,8 +1743,9 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) if (!ok) { m_timelineArea->setEnabled(false); m_projectList->setEnabled(false); - m_monitorManager->slotBlockMonitors(); - slotPreferences(6); + KMessageBox::sorry(this, i18n("Cannot open file %1.\nProject is corrupted.", url.path())); + slotGotProgressInfo(QString(), -1); + newFile(false, true); return; } m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path()); @@ -1652,9 +1754,9 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) if (m_timelineArea->count() > 1) m_timelineArea->setTabBarHidden(false); slotGotProgressInfo(QString(), -1); - m_clipMonitor->refreshMonitor(true); m_projectMonitor->adjustRulerSize(trackView->duration()); m_projectMonitor->slotZoneMoved(trackView->inPoint(), trackView->outPoint()); + m_clipMonitor->refreshMonitor(true); } void MainWindow::recoverFiles(QList staleFiles) @@ -1674,42 +1776,50 @@ void MainWindow::recoverFiles(QList staleFiles) } } - void MainWindow::parseProfiles(const QString &mltPath) { - // kDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <exec() == QDialog::Rejected) { + ::exit(0); + } + KUrl rendererPath = getUrl->selectedUrl(); + delete getUrl; + if (rendererPath.isEmpty()) ::exit(0); + KdenliveSettings::setRendererpath(rendererPath.path()); + } + QStringList profilesFilter; profilesFilter << "*"; QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); - if (profilesList.isEmpty()) { // Cannot find MLT path, try finding melt QString profilePath = KdenliveSettings::rendererpath(); if (!profilePath.isEmpty()) { profilePath = profilePath.section('/', 0, -3); KdenliveSettings::setMltpath(profilePath + "/share/mlt/profiles/"); - QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); + profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); } - if (profilesList.isEmpty()) { // Cannot find the MLT profiles, ask for location - KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(KdenliveSettings::mltpath(), i18n("Cannot find your Mlt profiles, please give the path"), this); + KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(KdenliveSettings::mltpath(), i18n("Cannot find your MLT profiles, please give the path"), this); getUrl->fileDialog()->setMode(KFile::Directory); if (getUrl->exec() == QDialog::Rejected) { ::exit(0); @@ -1718,25 +1828,13 @@ void MainWindow::parseProfiles(const QString &mltPath) delete getUrl; if (mltPath.isEmpty()) ::exit(0); KdenliveSettings::setMltpath(mltPath.path(KUrl::AddTrailingSlash)); - QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); - } - } - - if (KdenliveSettings::rendererpath().isEmpty()) { - // Cannot find the MLT melt renderer, ask for location - KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(QString(), i18n("Cannot find the melt program required for rendering (part of Mlt)"), this); - if (getUrl->exec() == QDialog::Rejected) { - ::exit(0); + profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); } - KUrl rendererPath = getUrl->selectedUrl(); - delete getUrl; - if (rendererPath.isEmpty()) ::exit(0); - KdenliveSettings::setRendererpath(rendererPath.path()); } kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath(); - // Parse MLT profiles to build a list of available video formats + // Parse again MLT profiles to build a list of available video formats if (profilesList.isEmpty()) parseProfiles(); } @@ -1788,6 +1886,8 @@ void MainWindow::slotEditProjectSettings() QString profile = w->selectedProfile(); m_activeDocument->setProjectFolder(w->selectedFolder()); if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path(KUrl::AddTrailingSlash)); + if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs(); + if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs(); if (m_activeDocument->profilePath() != profile) { // Profile was changed double dar = m_activeDocument->dar(); @@ -1806,6 +1906,7 @@ void MainWindow::slotEditProjectSettings() m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); m_effectStack->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode()); + m_projectList->updateProjectFormat(m_activeDocument->timecode()); if (m_renderWidget) m_renderWidget->setProfile(m_activeDocument->mltProfile()); m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); //m_activeDocument->clipManager()->resetProducersList(m_projectMonitor->render->producersList()); @@ -1813,6 +1914,8 @@ void MainWindow::slotEditProjectSettings() if (updateFps) m_activeTimeline->updateProjectFps(); m_activeDocument->setModified(true); m_commandStack->activeStack()->clear(); + //Update the mouse position display so it will display in DF/NDF format by default based on the project setting. + slotUpdateMousePosition(0); // We need to desactivate & reactivate monitors to get a refresh //m_monitorManager->switchMonitors(); } @@ -1827,7 +1930,7 @@ void MainWindow::slotRenderProject() QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder(); m_renderWidget = new RenderWidget(projectfolder, this); connect(m_renderWidget, SIGNAL(shutdown()), this, SLOT(slotShutdown())); - connect(m_renderWidget, SIGNAL(selectedRenderProfile(const QString &, const QString &, const QString&)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &, const QString&))); + connect(m_renderWidget, SIGNAL(selectedRenderProfile(const QString &, const QString &, const QString &, const QString&)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &, const QString &, const QString&))); connect(m_renderWidget, SIGNAL(prepareRenderingData(bool, bool, const QString&)), this, SLOT(slotPrepareRendering(bool, bool, const QString&))); connect(m_renderWidget, SIGNAL(abortProcess(const QString &)), this, SIGNAL(abortRenderJob(const QString &))); connect(m_renderWidget, SIGNAL(openDvdWizard(const QString &, const QString &)), this, SLOT(slotDvdWizard(const QString &, const QString &))); @@ -1835,24 +1938,38 @@ void MainWindow::slotRenderProject() m_renderWidget->setProfile(m_activeDocument->mltProfile()); m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); - m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl")); + m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("rendercategory"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl")); } } + slotCheckRenderStatus(); /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); if (currentTab) m_renderWidget->setTimeline(currentTab); m_renderWidget->setDocument(m_activeDocument);*/ m_renderWidget->show(); m_renderWidget->showNormal(); + + m_activeTimeline->tracksNumber(); + m_renderWidget->enableAudio(false); + //m_renderWidget->export_audio; +} + +void MainWindow::slotCheckRenderStatus() +{ + // Make sure there are no missing clips + if (m_renderWidget) + m_renderWidget->missingClips(m_projectList->hasMissingClips()); } void MainWindow::setRenderingProgress(const QString &url, int progress) { - if (m_renderWidget) m_renderWidget->setRenderJob(url, progress); + if (m_renderWidget) + m_renderWidget->setRenderJob(url, progress); } void MainWindow::setRenderingFinished(const QString &url, int status, const QString &error) { - if (m_renderWidget) m_renderWidget->setRenderStatus(url, status, error); + if (m_renderWidget) + m_renderWidget->setRenderStatus(url, status, error); } void MainWindow::slotCleanProject() @@ -1921,13 +2038,13 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); - disconnect(m_zoomSlider, SIGNAL(valueChanged(int)), m_activeTimeline, SLOT(slotChangeZoom(int))); + disconnect(m_activeTimeline->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay())); disconnect(m_activeTimeline->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); - disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); + disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int))); disconnect(m_activeTimeline, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); disconnect(m_activeTimeline, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); - disconnect(m_activeTimeline, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int))); + disconnect(m_activeTimeline, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int))); disconnect(m_activeDocument, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool))); disconnect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); disconnect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); @@ -1941,6 +2058,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs())); disconnect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); + disconnect(m_projectList, SIGNAL(updateRenderStatus()), this, SLOT(slotCheckRenderStatus())); + disconnect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), m_activeTimeline->projectView(), SLOT(slotUpdateClip(const QString &, bool))); m_effectStack->clear(); } //m_activeDocument->setRenderer(NULL); @@ -1956,18 +2075,23 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode()); connect(m_projectList, SIGNAL(clipSelected(DocClipBase *, QPoint)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint))); connect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor())); + connect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), trackView->projectView(), SLOT(slotUpdateClip(const QString &, bool))); + connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified())); connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString))); + connect(m_projectList, SIGNAL(findInTimeline(const QString&)), this, SLOT(slotClipInTimeline(const QString&))); + connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); connect(trackView, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); connect(trackView, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); - connect(trackView, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int))); + connect(trackView, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int))); connect(trackView, SIGNAL(updateTracksInfo()), this, SLOT(slotUpdateTrackInfo())); connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int))); connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int))); connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint))); + connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_projectList, SLOT(slotUpdateClipCut(QPoint))); connect(m_projectMonitor, SIGNAL(durationChanged(int)), trackView, SLOT(setDuration(int))); connect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), doc, SLOT(checkProjectClips())); @@ -1989,37 +2113,41 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); m_zoomSlider->setValue(doc->zoom().x()); - connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int))); connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); connect(trackView->projectView(), SIGNAL(zoomOut()), this, SLOT(slotZoomOut())); connect(trackView, SIGNAL(setZoom(int)), this, SLOT(slotSetZoom(int))); connect(trackView->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); - connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); + connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int))); + connect(trackView->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay())); connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); + connect(m_effectStack, SIGNAL(updateClipRegion(ClipItem*, int, QString)), trackView->projectView(), SLOT(slotUpdateClipRegion(ClipItem*, int, QString))); connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); connect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*))); connect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); connect(m_transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int))); + connect(m_effectStack, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int))); connect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs())); connect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); + connect(m_projectList, SIGNAL(updateRenderStatus()), this, SLOT(slotCheckRenderStatus())); - trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup); + trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup, (QMenu*)(factory()->container("marker_menu", this))); m_activeTimeline = trackView; if (m_renderWidget) { + slotCheckRenderStatus(); m_renderWidget->setProfile(doc->mltProfile()); m_renderWidget->setGuides(doc->guidesXml(), doc->projectDuration()); m_renderWidget->setDocumentPath(doc->projectFolder().path(KUrl::AddTrailingSlash)); - m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("renderprofile"), doc->getDocumentProperty("renderurl")); + m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("rendercategory"), doc->getDocumentProperty("renderprofile"), doc->getDocumentProperty("renderurl")); } //doc->setRenderer(m_projectMonitor->render); m_commandStack->setActiveStack(doc->commandStack()); @@ -2032,11 +2160,13 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha setCaption(doc->description(), doc->isModified()); m_saveAction->setEnabled(doc->isModified()); + m_normalEditTool->setChecked(true); m_activeDocument = doc; m_activeTimeline->updateProjectFps(); m_activeDocument->checkProjectClips(); if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings(); - + //Update the mouse position display so it will display in DF/NDF format by default based on the project setting. + slotUpdateMousePosition(0); // set tool to select tool m_buttonSelectTool->setChecked(true); } @@ -2049,7 +2179,16 @@ void MainWindow::slotZoneMoved(int start, int end) void MainWindow::slotGuidesUpdated() { - if (m_renderWidget) m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); + if (m_renderWidget) + m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); +} + +void MainWindow::slotEditKeys() +{ + KShortcutsDialog dialog(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, this); + dialog.addCollection(actionCollection(), i18nc("general keyboard shortcuts", "General")); + dialog.addCollection(m_effectsActionCollection, i18nc("effects and transitions keyboard shortcuts", "Effects & Transitions")); + dialog.configure(); } void MainWindow::slotPreferences(int page, int option) @@ -2093,10 +2232,12 @@ void MainWindow::updateConfiguration() m_activeTimeline->refresh(); m_activeTimeline->projectView()->checkAutoScroll(); m_activeTimeline->projectView()->checkTrackHeight(); - if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs(); + if (m_activeDocument) + m_activeDocument->clipManager()->checkAudioThumbs(); } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); + m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio()); // Update list of transcoding profiles loadTranscoders(); @@ -2106,13 +2247,17 @@ void MainWindow::updateConfiguration() } +void MainWindow::slotSwitchSplitAudio() +{ + KdenliveSettings::setSplitaudio(!KdenliveSettings::splitaudio()); + m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio()); +} void MainWindow::slotSwitchVideoThumbs() { KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails()); - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->slotUpdateAllThumbs(); - } m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); } @@ -2122,7 +2267,8 @@ void MainWindow::slotSwitchAudioThumbs() if (m_activeTimeline) { m_activeTimeline->refresh(); m_activeTimeline->projectView()->checkAutoScroll(); - if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs(); + if (m_activeDocument) + m_activeDocument->clipManager()->checkAudioThumbs(); } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); } @@ -2130,9 +2276,8 @@ void MainWindow::slotSwitchAudioThumbs() void MainWindow::slotSwitchMarkersComments() { KdenliveSettings::setShowmarkers(!KdenliveSettings::showmarkers()); - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->refresh(); - } m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers()); } @@ -2143,17 +2288,34 @@ void MainWindow::slotSwitchSnap() } -void MainWindow::slotDeleteTimelineClip() +void MainWindow::slotDeleteItem() { - if (QApplication::focusWidget() && QApplication::focusWidget()->parentWidget() && QApplication::focusWidget()->parentWidget()->parentWidget() && QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) m_projectList->slotRemoveClip(); - else if (m_activeTimeline) { - m_activeTimeline->projectView()->deleteSelectedClips(); + if (QApplication::focusWidget() && + QApplication::focusWidget()->parentWidget() && + QApplication::focusWidget()->parentWidget()->parentWidget() && + QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) { + m_projectList->slotRemoveClip(); + + } else { + QWidget *widget = QApplication::focusWidget(); + while (widget) { + if (widget == m_effectStackDock) { + m_effectStack->slotItemDel(); + return; + } + widget = widget->parentWidget(); + } + + // effect stack has no focus + if (m_activeTimeline) + m_activeTimeline->projectView()->deleteSelectedClips(); } } void MainWindow::slotUpdateClipMarkers(DocClipBase *clip) { - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); + if (m_clipMonitor->isActive()) + m_clipMonitor->checkOverlay(); m_clipMonitor->updateMarkers(clip); } @@ -2180,9 +2342,8 @@ void MainWindow::slotAddClipMarker() QString id = clip->getId(); CommentedTime marker(pos, i18n("Marker")); MarkerDialog d(clip, marker, m_activeDocument->timecode(), i18n("Add Marker"), this); - if (d.exec() == QDialog::Accepted) { + if (d.exec() == QDialog::Accepted) m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment()); - } } void MainWindow::slotDeleteClipMarker() @@ -2297,6 +2458,8 @@ void MainWindow::slotInsertTrack(int ix) m_projectMonitor->activateMonitor(); if (m_activeTimeline) m_activeTimeline->projectView()->slotInsertTrack(ix); + if (m_activeDocument) + m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); } void MainWindow::slotDeleteTrack(int ix) @@ -2304,13 +2467,17 @@ void MainWindow::slotDeleteTrack(int ix) m_projectMonitor->activateMonitor(); if (m_activeTimeline) m_activeTimeline->projectView()->slotDeleteTrack(ix); + if (m_activeDocument) + m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); } -void MainWindow::slotChangeTrack(int ix) +void MainWindow::slotConfigTrack(int ix) { m_projectMonitor->activateMonitor(); if (m_activeTimeline) - m_activeTimeline->projectView()->slotChangeTrack(ix); + m_activeTimeline->projectView()->slotConfigTracks(ix); + if (m_activeDocument) + m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); } void MainWindow::slotEditGuide() @@ -2333,9 +2500,8 @@ void MainWindow::slotDeleteAllGuides() void MainWindow::slotCutTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->cutSelectedClips(); - } } void MainWindow::slotInsertClipOverwrite() @@ -2348,58 +2514,56 @@ void MainWindow::slotInsertClipOverwrite() void MainWindow::slotSelectTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectClip(true); - } } void MainWindow::slotSelectTimelineTransition() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectTransition(true); - } } void MainWindow::slotDeselectTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectClip(false, true); - } } void MainWindow::slotDeselectTimelineTransition() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectTransition(false, true); - } } void MainWindow::slotSelectAddTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectClip(true, true); - } } void MainWindow::slotSelectAddTimelineTransition() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectTransition(true, true); - } } void MainWindow::slotGroupClips() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->groupClips(); - } } void MainWindow::slotUnGroupClips() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->groupClips(false); - } +} + +void MainWindow::slotEditItemDuration() +{ + if (m_activeTimeline) + m_activeTimeline->projectView()->editItemDuration(); } void MainWindow::slotAddProjectClip(KUrl url) @@ -2449,31 +2613,62 @@ void MainWindow::slotAddCustomEffect(QAction *result) void MainWindow::slotZoomIn() { m_zoomSlider->setValue(m_zoomSlider->value() - 1); + slotShowZoomSliderToolTip(); } void MainWindow::slotZoomOut() { m_zoomSlider->setValue(m_zoomSlider->value() + 1); + slotShowZoomSliderToolTip(); } void MainWindow::slotFitZoom() { - if (m_activeTimeline) { + if (m_activeTimeline) m_zoomSlider->setValue(m_activeTimeline->fitZoom()); - } } void MainWindow::slotSetZoom(int value) { + if (m_activeTimeline) + m_activeTimeline->slotChangeZoom(value); + + m_zoomOut->setEnabled(value < m_zoomSlider->maximum()); + m_zoomIn->setEnabled(value > m_zoomSlider->minimum()); + slotUpdateZoomSliderToolTip(value); + + m_zoomSlider->blockSignals(true); m_zoomSlider->setValue(value); + m_zoomSlider->blockSignals(false); +} + +void MainWindow::slotShowZoomSliderToolTip(int zoomlevel) +{ + if (zoomlevel != -1) + slotUpdateZoomSliderToolTip(zoomlevel); + + QPoint global = m_zoomSlider->rect().topLeft(); + global.ry() += m_zoomSlider->height() / 2; + QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), m_zoomSlider->mapToGlobal(global)); + QApplication::sendEvent(m_zoomSlider, &toolTipEvent); +} + +void MainWindow::slotUpdateZoomSliderToolTip(int zoomlevel) +{ + m_zoomSlider->setToolTip(i18n("Zoom Level: %1/13", (13 - zoomlevel))); } void MainWindow::slotGotProgressInfo(const QString &message, int progress) { m_statusProgressBar->setValue(progress); if (progress >= 0) { - if (!message.isEmpty()) m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message); + if (!message.isEmpty()) + m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message); m_statusProgressBar->setVisible(true); + } else if (progress == -2) { + if (!message.isEmpty()) + m_messageLabel->setMessage(message, ErrorMessage); + m_statusProgressBar->setVisible(false); } else { m_messageLabel->setMessage(QString(), DefaultMessage); m_statusProgressBar->setVisible(false); @@ -2531,10 +2726,12 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) if (description.isEmpty()) description = clip->getProperty("description"); else newprops.insert("templatetext", description); //newprops.insert("xmldata", m_projectList->generateTemplateXml(newtemplate, description).toString()); - - EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); - m_activeDocument->commandStack()->push(command); + if (!newprops.isEmpty()) { + EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); + m_activeDocument->commandStack()->push(command); + } } + delete dia; return; } QString path = clip->getProperty("resource"); @@ -2545,13 +2742,13 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) if (dia_ui->exec() == QDialog::Accepted) { QMap newprops; newprops.insert("xmldata", dia_ui->xml().toString()); - if (dia_ui->duration() != clip->duration().frames(m_activeDocument->fps()) - 1) { + if (dia_ui->outPoint() != clip->duration().frames(m_activeDocument->fps()) - 1) { // duration changed, we need to update duration - newprops.insert("out", QString::number(dia_ui->duration())); + newprops.insert("out", QString::number(dia_ui->outPoint())); } EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); m_activeDocument->commandStack()->push(command); - m_activeTimeline->projectView()->slotUpdateClip(clip->getId()); + //m_activeTimeline->projectView()->slotUpdateClip(clip->getId()); m_activeDocument->setModified(true); } delete dia_ui; @@ -2562,7 +2759,9 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) ClipProperties dia(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this); connect(&dia, SIGNAL(addMarker(const QString &, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(const QString &, GenTime, QString))); if (dia.exec() == QDialog::Accepted) { - EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true); + QMap newprops = dia.properties(); + if (newprops.isEmpty()) return; + EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); m_activeDocument->commandStack()->push(command); if (dia.needsTimelineRefresh()) { @@ -2572,11 +2771,27 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) } } + +void MainWindow::slotShowClipProperties(QList cliplist, QMap commonproperties) +{ + ClipProperties dia(cliplist, m_activeDocument->timecode(), commonproperties, this); + if (dia.exec() == QDialog::Accepted) { + QUndoCommand *command = new QUndoCommand(); + command->setText(i18n("Edit clips")); + for (int i = 0; i < cliplist.count(); i++) { + DocClipBase *clip = cliplist.at(i); + new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true, command); + } + m_activeDocument->commandStack()->push(command); + for (int i = 0; i < cliplist.count(); i++) + m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia.needsTimelineReload()); + } +} + void MainWindow::customEvent(QEvent* e) { - if (e->type() == QEvent::User) { + if (e->type() == QEvent::User) m_messageLabel->setMessage(static_cast (e)->message(), MltError); - } } void MainWindow::slotActivateEffectStackView() { @@ -2585,7 +2800,8 @@ void MainWindow::slotActivateEffectStackView() void MainWindow::slotActivateTransitionView(Transition *t) { - if (t) m_transitionConfig->raiseWindow(m_transitionConfigDock); + if (t) + m_transitionConfig->raiseWindow(m_transitionConfigDock); } void MainWindow::slotSnapRewind() @@ -2593,7 +2809,9 @@ void MainWindow::slotSnapRewind() if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->slotSeekToPreviousSnap(); - } else m_clipMonitor->slotSeekToPreviousSnap(); + } else { + m_clipMonitor->slotSeekToPreviousSnap(); + } } void MainWindow::slotSnapForward() @@ -2601,7 +2819,9 @@ void MainWindow::slotSnapForward() if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->slotSeekToNextSnap(); - } else m_clipMonitor->slotSeekToNextSnap(); + } else { + m_clipMonitor->slotSeekToNextSnap(); + } } void MainWindow::slotClipStart() @@ -2622,29 +2842,41 @@ void MainWindow::slotClipEnd() void MainWindow::slotZoneStart() { - if (m_projectMonitor->isActive()) m_projectMonitor->slotZoneStart(); - else m_clipMonitor->slotZoneStart(); + if (m_projectMonitor->isActive()) + m_projectMonitor->slotZoneStart(); + else + m_clipMonitor->slotZoneStart(); } void MainWindow::slotZoneEnd() { - if (m_projectMonitor->isActive()) m_projectMonitor->slotZoneEnd(); - else m_clipMonitor->slotZoneEnd(); + if (m_projectMonitor->isActive()) + m_projectMonitor->slotZoneEnd(); + else + m_clipMonitor->slotZoneEnd(); } void MainWindow::slotChangeTool(QAction * action) { - if (action == m_buttonSelectTool) slotSetTool(SELECTTOOL); - else if (action == m_buttonRazorTool) slotSetTool(RAZORTOOL); - else if (action == m_buttonSpacerTool) slotSetTool(SPACERTOOL); + if (action == m_buttonSelectTool) + slotSetTool(SELECTTOOL); + else if (action == m_buttonRazorTool) + slotSetTool(RAZORTOOL); + else if (action == m_buttonSpacerTool) + slotSetTool(SPACERTOOL); } void MainWindow::slotChangeEdit(QAction * action) { - if (!m_activeTimeline) return; - if (action == m_overwriteModeTool) m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT); - else if (action == m_insertModeTool) m_activeTimeline->projectView()->setEditMode(INSERTEDIT); - else m_activeTimeline->projectView()->setEditMode(NORMALEDIT); + if (!m_activeTimeline) + return; + + if (action == m_overwriteEditTool) + m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT); + else if (action == m_insertEditTool) + m_activeTimeline->projectView()->setEditMode(INSERTEDIT); + else + m_activeTimeline->projectView()->setEditMode(NORMALEDIT); } void MainWindow::slotSetTool(PROJECTTOOL tool) @@ -2670,20 +2902,20 @@ void MainWindow::slotSetTool(PROJECTTOOL tool) void MainWindow::slotCopy() { - if (!m_activeDocument || !m_activeTimeline) return; - m_activeTimeline->projectView()->copyClip(); + if (m_activeDocument && m_activeTimeline) + m_activeTimeline->projectView()->copyClip(); } void MainWindow::slotPaste() { - if (!m_activeDocument || !m_activeTimeline) return; - m_activeTimeline->projectView()->pasteClip(); + if (m_activeDocument && m_activeTimeline) + m_activeTimeline->projectView()->pasteClip(); } void MainWindow::slotPasteEffects() { - if (!m_activeDocument || !m_activeTimeline) return; - m_activeTimeline->projectView()->pasteClipEffects(); + if (m_activeDocument && m_activeTimeline) + m_activeTimeline->projectView()->pasteClipEffects(); } void MainWindow::slotFind() @@ -2700,11 +2932,10 @@ void MainWindow::slotFind() void MainWindow::slotFindNext() { - if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) { + if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) statusBar()->showMessage(i18n("Found: %1", m_findString)); - } else { + else statusBar()->showMessage(i18n("Reached end of project")); - } m_findTimer.start(4000); } @@ -2730,17 +2961,83 @@ void MainWindow::findTimeout() removeEventFilter(this); } +void MainWindow::slotClipInTimeline(const QString &clipId) +{ + if (m_activeTimeline && m_activeDocument) { + QList matching = m_activeTimeline->projectView()->findId(clipId); + + QMenu *inTimelineMenu = static_cast(factory()->container("clip_in_timeline", this)); + inTimelineMenu->clear(); + + QList actionList; + + for (int i = 0; i < matching.count(); ++i) { + QString track = QString::number(matching.at(i).track); + QString start = m_activeDocument->timecode().getTimecode(matching.at(i).startPos); + int j = 0; + QAction *a = new QAction(track + ": " + start, this); + a->setData(QStringList() << track << start); + connect(a, SIGNAL(triggered()), this, SLOT(slotSelectClipInTimeline())); + while (j < actionList.count()) { + if (actionList.at(j)->text() > a->text()) break; + j++; + } + actionList.insert(j, a); + } + inTimelineMenu->addActions(actionList); + + if (matching.empty()) + inTimelineMenu->setEnabled(false); + else + inTimelineMenu->setEnabled(true); + } +} + +void MainWindow::slotClipInProjectTree() +{ + if (m_activeTimeline) { + const QStringList &clipIds = m_activeTimeline->projectView()->selectedClips(); + if (clipIds.isEmpty()) + return; + m_projectListDock->raise(); + for (int i = 0; i < clipIds.count(); i++) + m_projectList->selectItemById(clipIds.at(i)); + if (m_projectMonitor->isActive()) + slotSwitchMonitors(); + } +} + +/*void MainWindow::slotClipToProjectTree() +{ + if (m_activeTimeline) { + const QList clips = m_activeTimeline->projectView()->selectedClipItems(); + if (clips.isEmpty()) return; + for (int i = 0; i < clips.count(); i++) { + m_projectList->slotAddXmlClip(clips.at(i)->itemXml()); + } + //m_projectList->selectItemById(clipIds.at(i)); + } +}*/ + +void MainWindow::slotSelectClipInTimeline() +{ + if (m_activeTimeline) { + QAction *action = qobject_cast(sender()); + QStringList data = action->data().toStringList(); + m_activeTimeline->projectView()->selectFound(data.at(0), data.at(1)); + } +} + void MainWindow::keyPressEvent(QKeyEvent *ke) { if (m_findActivated) { if (ke->key() == Qt::Key_Backspace) { m_findString = m_findString.left(m_findString.length() - 1); - if (!m_findString.isEmpty()) { + if (!m_findString.isEmpty()) findAhead(); - } else { + else findTimeout(); - } m_findTimer.start(4000); ke->accept(); @@ -2758,19 +3055,18 @@ void MainWindow::keyPressEvent(QKeyEvent *ke) ke->accept(); return; } - } else KXmlGuiWindow::keyPressEvent(ke); + } else { + KXmlGuiWindow::keyPressEvent(ke); + } } /** Gets called when the window gets hidden */ void MainWindow::hideEvent(QHideEvent */*event*/) { - // kDebug() << "I was hidden"; - // issue http://www.kdenlive.org/mantis/view.php?id=231 - if (isMinimized()) { - // kDebug() << "I am minimized"; - if (m_monitorManager) m_monitorManager->stopActiveMonitor(); - } + if (isMinimized()) + if (m_monitorManager) + m_monitorManager->stopActiveMonitor(); } bool MainWindow::eventFilter(QObject *obj, QEvent *event) @@ -2781,7 +3077,9 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) if (ke->text().trimmed().isEmpty()) return false; ke->accept(); return true; - } else return false; + } else { + return false; + } } else { // pass the event on to the parent class return QMainWindow::eventFilter(obj, event); @@ -2811,110 +3109,105 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone) vbox->addWidget(url); vbox->addWidget(label2); vbox->addWidget(edit); - if (dialog->exec() == QDialog::Accepted) render->saveZone(url->url(), edit->text(), zone); + if (dialog->exec() == QDialog::Accepted) + render->saveZone(url->url(), edit->text(), zone); } void MainWindow::slotSetInPoint() { - if (m_clipMonitor->isActive()) { + if (m_clipMonitor->isActive()) m_clipMonitor->slotSetZoneStart(); - } else m_projectMonitor->slotSetZoneStart(); + else + m_projectMonitor->slotSetZoneStart(); //else m_activeTimeline->projectView()->setInPoint(); } void MainWindow::slotSetOutPoint() { - if (m_clipMonitor->isActive()) { + if (m_clipMonitor->isActive()) m_clipMonitor->slotSetZoneEnd(); - } else m_projectMonitor->slotSetZoneEnd(); + else + m_projectMonitor->slotSetZoneEnd(); // else m_activeTimeline->projectView()->setOutPoint(); } void MainWindow::slotResizeItemStart() { - if (m_activeTimeline) m_activeTimeline->projectView()->setInPoint(); + if (m_activeTimeline) + m_activeTimeline->projectView()->setInPoint(); } void MainWindow::slotResizeItemEnd() { - if (m_activeTimeline) m_activeTimeline->projectView()->setOutPoint(); + if (m_activeTimeline) + m_activeTimeline->projectView()->setOutPoint(); } -void MainWindow::slotGetNewLumaStuff() +int MainWindow::getNewStuff(const QString &configFile) { - //KNS::Entry::List download(); - KNS::Entry::List entries = KNS::Engine::download(); - // list of changed entries - kDebug() << "// PARSING KNS"; - foreach(KNS::Entry* entry, entries) { - // care only about installed ones - if (entry->status() == KNS::Entry::Installed) { - foreach(const QString &file, entry->installedFiles()) { - kDebug() << "// CURRENTLY INSTALLED: " << file; - } - } + KNS3::Entry::List entries; +#if KDE_IS_VERSION(4,3,80) + KNS3::DownloadDialog dialog(configFile); + dialog.exec(); + entries = dialog.changedEntries(); + foreach(const KNS3::Entry &entry, entries) { + if (entry.status() == KNS3::Entry::Installed) + kDebug() << "// Installed files: " << entry.installedFiles(); } - qDeleteAll(entries); - initEffects::refreshLumas(); - m_activeTimeline->projectView()->reloadTransitionLumas(); +#else + KNS::Engine engine(0); + if (engine.init(configFile)) + entries = engine.downloadDialogModal(this); + foreach(KNS::Entry *entry, entries) { + if (entry->status() == KNS::Entry::Installed) + kDebug() << "// Installed files: " << entry->installedFiles(); + } +#endif /* KDE_IS_VERSION(4,3,80) */ + return entries.size(); } -void MainWindow::slotGetNewRenderStuff() +void MainWindow::slotGetNewTitleStuff() { - //KNS::Entry::List download(); + if (getNewStuff("kdenlive_titles.knsrc") > 0) + TitleWidget::refreshTitleTemplates(); +} - KNS::Engine engine(0); - if (engine.init("kdenlive_render.knsrc")) { - KNS::Entry::List entries = engine.downloadDialogModal(this); - - if (entries.size() > 0) { - foreach(KNS::Entry* entry, entries) { - // care only about installed ones - if (entry->status() == KNS::Entry::Installed) { - foreach(const QString &file, entry->installedFiles()) { - kDebug() << "// CURRENTLY INSTALLED: " << file; - } - } - } - } - if (m_renderWidget) m_renderWidget->reloadProfiles(); +void MainWindow::slotGetNewLumaStuff() +{ + if (getNewStuff("kdenlive_wipes.knsrc") > 0) { + initEffects::refreshLumas(); + m_activeTimeline->projectView()->reloadTransitionLumas(); } } -void MainWindow::slotGetNewMltProfileStuff() +void MainWindow::slotGetNewRenderStuff() { - //KNS::Entry::List download(); - - KNS::Engine engine(0); - if (engine.init("kdenlive_mltprofiles.knsrc")) { - KNS::Entry::List entries = engine.downloadDialogModal(this); - - if (entries.size() > 0) { - foreach(KNS::Entry* entry, entries) { - // care only about installed ones - if (entry->status() == KNS::Entry::Installed) { - foreach(const QString &file, entry->installedFiles()) { - kDebug() << "// CURRENTLY INSTALLED: " << file; - } - } - } + if (getNewStuff("kdenlive_renderprofiles.knsrc") > 0) + if (m_renderWidget) + m_renderWidget->reloadProfiles(); +} - // update the list of profiles in settings dialog - KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); - if (d) d->checkProfile(); - } +void MainWindow::slotGetNewMltProfileStuff() +{ + if (getNewStuff("kdenlive_projectprofiles.knsrc") > 0) { + // update the list of profiles in settings dialog + KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); + if (d) + d->checkProfile(); } } void MainWindow::slotAutoTransition() { - if (m_activeTimeline) m_activeTimeline->projectView()->autoTransition(); + if (m_activeTimeline) + m_activeTimeline->projectView()->autoTransition(); } void MainWindow::slotSplitAudio() { - if (m_activeTimeline) m_activeTimeline->projectView()->splitAudio(); + if (m_activeTimeline) + m_activeTimeline->projectView()->splitAudio(); } void MainWindow::slotUpdateClipType(QAction *action) @@ -2954,9 +3247,8 @@ void MainWindow::slotMaximizeCurrent(bool /*show*/) { m_timelineState = saveState(); QWidget *par = focusWidget()->parentWidget(); - while (par->parentWidget() && par->parentWidget() != this) { + while (par->parentWidget() && par->parentWidget() != this) par = par->parentWidget(); - } kDebug() << "CURRENT WIDGET: " << par->objectName(); } /*else { @@ -2977,8 +3269,11 @@ void MainWindow::loadTranscoders() QMapIterator i(profiles); while (i.hasNext()) { i.next(); + QStringList data = i.value().split(";", QString::SkipEmptyParts); QAction *a = transMenu->addAction(i.key()); - a->setData(i.value()); + a->setData(data); + if (data.count() > 1) + a->setToolTip(data.at(1)); connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode())); } } @@ -2986,13 +3281,22 @@ void MainWindow::loadTranscoders() void MainWindow::slotTranscode(KUrl::List urls) { QString params; + QString desc; + QString condition; if (urls.isEmpty()) { - urls.append(m_projectList->currentClipUrl()); QAction *action = qobject_cast(sender()); - params = action->data().toString(); + QStringList data = action->data().toStringList(); + params = data.at(0); + if (data.count() > 1) desc = data.at(1); + if (data.count() > 2) condition = data.at(2); + urls << m_projectList->getConditionalUrls(condition); + urls.removeAll(KUrl()); } - if (urls.isEmpty()) return; - ClipTranscode *d = new ClipTranscode(urls, params); + if (urls.isEmpty()) { + m_messageLabel->setMessage(i18n("No clip to transcode"), ErrorMessage); + return; + } + ClipTranscode *d = new ClipTranscode(urls, params, desc); connect(d, SIGNAL(addClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); d->show(); //QProcess::startDetached("ffmpeg", parameters); @@ -3005,10 +3309,11 @@ void MainWindow::slotTranscodeClip() slotTranscode(urls); } -void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &name, const QString &file) +void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &file) { if (m_activeDocument == NULL) return; m_activeDocument->setDocumentProperty("renderdestination", dest); + m_activeDocument->setDocumentProperty("rendercategory", group); m_activeDocument->setDocumentProperty("renderprofile", name); m_activeDocument->setDocumentProperty("renderurl", file); m_activeDocument->setModified(true); @@ -3102,6 +3407,10 @@ void MainWindow::slotUpdateTimecodeFormat(int ix) KdenliveSettings::setFrametimecode(ix == 1); m_clipMonitor->updateTimecodeFormat(); m_projectMonitor->updateTimecodeFormat(); + m_transitionConfig->updateTimecodeFormat(); + m_effectStack->updateTimecodeFormat(); + //m_activeTimeline->projectView()->clearSelection(); + m_activeTimeline->updateRuler(); } void MainWindow::slotRemoveFocus() @@ -3127,6 +3436,9 @@ void MainWindow::slotShutdown() if (interface && interface->isServiceRegistered("org.kde.ksmserver")) { QDBusInterface smserver("org.kde.ksmserver", "/KSMServer", "org.kde.KSMServerInterface"); smserver.call("logout", 1, 2, 2); + } else if (interface && interface->isServiceRegistered("org.gnome.SessionManager")) { + QDBusInterface smserver("org.gnome.SessionManager", "/org/gnome/SessionManager", "org.gnome.SessionManager"); + smserver.call("Shutdown"); } } @@ -3164,6 +3476,8 @@ void MainWindow::slotChangePalette(QAction *action, const QString &themename) ((QWidget*)subchild)->setPalette(plt); } } + if (m_activeTimeline) + m_activeTimeline->projectView()->updatePalette(); } @@ -3207,6 +3521,84 @@ QPixmap MainWindow::createSchemePreviewIcon(const KSharedConfigPtr &config) return pixmap; } +void MainWindow::slotSwitchMonitors() +{ + m_monitorManager->slotSwitchMonitors(!m_clipMonitor->isActive()); + if (m_projectMonitor->isActive()) m_activeTimeline->projectView()->setFocus(); + else m_projectList->focusTree(); +} + +void MainWindow::slotInsertZoneToTree() +{ + if (!m_clipMonitor->isActive() || m_clipMonitor->activeClip() == NULL) return; + QStringList info = m_clipMonitor->getZoneInfo(); + m_projectList->slotAddClipCut(info.at(0), info.at(1).toInt(), info.at(2).toInt()); +} + +void MainWindow::slotInsertZoneToTimeline() +{ + if (m_activeTimeline == NULL || m_clipMonitor->activeClip() == NULL) return; + QStringList info = m_clipMonitor->getZoneInfo(); + m_activeTimeline->projectView()->insertClipCut(m_clipMonitor->activeClip(), info.at(1).toInt(), info.at(2).toInt()); +} + + +void MainWindow::slotDeleteProjectClips(QStringList ids, QMap folderids) +{ + if (m_activeDocument && m_activeTimeline) { + if (!ids.isEmpty()) { + for (int i = 0; i < ids.size(); ++i) { + m_activeTimeline->slotDeleteClip(ids.at(i)); + } + m_activeDocument->clipManager()->slotDeleteClips(ids); + } + if (!folderids.isEmpty()) m_projectList->deleteProjectFolder(folderids); + m_activeDocument->setModified(true); + } +} + +void MainWindow::slotShowTitleBars(bool show) +{ + if (show) { + m_effectStackDock->setTitleBarWidget(0); + m_clipMonitorDock->setTitleBarWidget(0); + m_projectMonitorDock->setTitleBarWidget(0); +#ifndef Q_WS_MAC + m_recMonitorDock->setTitleBarWidget(0); +#endif + m_effectListDock->setTitleBarWidget(0); + m_transitionConfigDock->setTitleBarWidget(0); + m_projectListDock->setTitleBarWidget(0); + m_undoViewDock->setTitleBarWidget(0); + m_vectorscopeDock->setTitleBarWidget(0); + } else { + if (!m_effectStackDock->isFloating()) { m_effectStackDock->setTitleBarWidget(new QWidget(this)); } + if (!m_clipMonitorDock->isFloating()) { m_clipMonitorDock->setTitleBarWidget(new QWidget(this)); } + if (!m_projectMonitorDock->isFloating()) { m_projectMonitorDock->setTitleBarWidget(new QWidget(this)); } +#ifndef Q_WS_MAC + if (!m_recMonitorDock->isFloating()) { m_recMonitorDock->setTitleBarWidget(new QWidget(this)); } +#endif + if (!m_effectListDock->isFloating()) { m_effectListDock->setTitleBarWidget(new QWidget(this)); } + if (!m_transitionConfigDock->isFloating()) { m_transitionConfigDock->setTitleBarWidget(new QWidget(this)); } + if (!m_projectListDock->isFloating()) { m_projectListDock->setTitleBarWidget(new QWidget(this)); } + if (!m_undoViewDock->isFloating()) { m_undoViewDock->setTitleBarWidget(new QWidget(this)); } + if (!m_vectorscopeDock->isFloating()) { m_vectorscopeDock->setTitleBarWidget(new QWidget(this)); } + } + KdenliveSettings::setShowtitlebars(show); +} + +void MainWindow::slotSwitchTitles() +{ + slotShowTitleBars(!KdenliveSettings::showtitlebars()); +} + +QString MainWindow::getMimeType() +{ + QString mimetype = "application/x-kdenlive"; + KMimeType::Ptr mime = KMimeType::mimeType(mimetype); + if (!mime) mimetype = "*.kdenlive"; + return mimetype; +} #include "mainwindow.moc"