#include <KNotifyConfigWidget>
#include <knewstuff2/engine.h>
#include <knewstuff2/ui/knewstuffaction.h>
+#include <KToolBar>
#include <QTextStream>
#include <QTimer>
m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this);
m_clipMonitorDock->setObjectName("clip_monitor");
- m_clipMonitor = new Monitor("clip", m_monitorManager, this);
+ 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");
- m_projectMonitor = new Monitor("project", m_monitorManager, this);
+ m_projectMonitor = new Monitor("project", m_monitorManager, QString(), this);
m_projectMonitorDock->setWidget(m_projectMonitor);
addDockWidget(Qt::TopDockWidgetArea, m_projectMonitorDock);
setupGUI();
+
/*ScriptingPart* sp = new ScriptingPart(this, QStringList());
guiFactory()->addClient(sp);*/
if (m_clipMonitor) m_clipMonitor->stop();
delete m_effectStack;
delete m_activeTimeline;
+#ifndef Q_WS_MAC
+ // This sometimes causes crash on exit on OS X for some reason.
delete m_projectMonitor;
delete m_clipMonitor;
+#endif
delete m_activeDocument;
delete m_shortcutRemoveFocus;
Mlt::Factory::close();
if (m_renderWidget) {
int waitingJobs = m_renderWidget->waitingJobsCount();
if (waitingJobs > 0) {
- switch (KMessageBox::warningYesNoCancel(this, i18n("You have %1 rendering jobs waiting in the queue.\nWhat do you want to do with these jobs?", waitingJobs), QString(), KGuiItem(i18n("Start them now")), KGuiItem(i18n("Delete them")))) {
+ switch (KMessageBox::warningYesNoCancel(this, i18np("You have 1 rendering job waiting in the queue.\nWhat do you want to do with this job?", "You have %1 rendering jobs waiting in the queue.\nWhat do you want to do with these jobs?", waitingJobs), QString(), KGuiItem(i18n("Start them now")), KGuiItem(i18n("Delete them")))) {
case KMessageBox::Yes :
// create script with waiting jobs and start it
if (m_renderWidget->startWaitingRenderJobs() == false) return false;
{
m_projectList->setRenderer(m_projectMonitor->render);
- connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &)));
+ //connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &)));
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_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &)));
m_statusProgressBar->setMaximumWidth(150);
m_statusProgressBar->setVisible(false);
- QWidget *w = new QWidget;
-
- QHBoxLayout *layout = new QHBoxLayout;
- w->setLayout(layout);
- layout->setContentsMargins(5, 0, 5, 0);
- QToolBar *toolbar = new QToolBar("statusToolBar", this);
-
-
+ KToolBar *toolbar = new KToolBar("statusToolBar", this, Qt::BottomToolBarArea);
+ toolbar->setMovable(false);
m_toolGroup = new QActionGroup(this);
-
- QString style1 = "QToolButton {background-color: rgba(230, 230, 230, 220); 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;}";
+ 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 {background-color: rgba(230, 230, 230, 220); 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;}";
m_buttonSelectTool = new KAction(KIcon("kdenlive-select-tool"), i18n("Selection tool"), this);
m_buttonSelectTool->setShortcut(i18nc("Selection tool shortcut", "s"));
toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly);
QWidget * actionWidget;
+ int max = toolbar->iconSizeDefault() + 2;
actionWidget = toolbar->widgetForAction(m_buttonSelectTool);
- actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(18);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
actionWidget = toolbar->widgetForAction(m_buttonRazorTool);
- actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(18);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
actionWidget = toolbar->widgetForAction(m_buttonSpacerTool);
- actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(18);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
toolbar->setStyleSheet(style1);
connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *)));
connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom()));
actionWidget = toolbar->widgetForAction(m_buttonFitZoom);
- actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(18);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
m_zoomSlider = new QSlider(Qt::Horizontal, this);
m_zoomSlider->setMaximum(13);
m_zoomSlider->setMaximumWidth(150);
m_zoomSlider->setMinimumWidth(100);
-
-#ifdef Q_WS_MAC
- const int contentHeight = QFontMetrics(w->font()).height() + 14;
-#else
- const int contentHeight = QFontMetrics(w->font()).height() + 10;
-#endif
-
- QString style = "QSlider::groove:horizontal { background-color: rgba(230, 230, 230, 220);border: 1px solid #999999;height: 8px;border-radius: 3px;margin-top:3px }";
- style.append("QSlider::handle:horizontal { background-color: white; border: 1px solid #999999;width: 9px;margin: -2px 0;border-radius: 3px; }");
-
- m_zoomSlider->setStyleSheet(style);
-
- //m_zoomSlider->height() + 5;
- statusBar()->setMinimumHeight(contentHeight);
-
-
toolbar->addWidget(m_zoomSlider);
m_buttonVideoThumbs = new KAction(KIcon("kdenlive-show-videothumb"), i18n("Show video thumbnails"), this);
m_buttonSnap->setCheckable(true);
m_buttonSnap->setChecked(KdenliveSettings::snaptopoints());
connect(m_buttonSnap, SIGNAL(triggered()), this, SLOT(slotSwitchSnap()));
- layout->addWidget(toolbar);
-
actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs);
- actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(18);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
actionWidget = toolbar->widgetForAction(m_buttonAudioThumbs);
- actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(18);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
actionWidget = toolbar->widgetForAction(m_buttonShowMarkers);
- actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(18);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
actionWidget = toolbar->widgetForAction(m_buttonSnap);
- actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(18);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
m_messageLabel = new StatusBarMessageLabel(this);
m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding);
statusBar()->addWidget(m_messageLabel, 10);
statusBar()->addWidget(m_statusProgressBar, 0);
- statusBar()->addPermanentWidget(w);
+ statusBar()->addPermanentWidget(toolbar);
statusBar()->insertPermanentFixedItem("00:00:00:00", ID_TIMELINE_POS);
statusBar()->addPermanentWidget(m_timecodeFormat);
- statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4);
+ //statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 3);
collection->addAction("select_tool", m_buttonSelectTool);
collection->addAction("razor_tool", m_buttonRazorTool);
projectRender->setShortcut(Qt::CTRL + Qt::Key_Return);
connect(projectRender, SIGNAL(triggered(bool)), this, SLOT(slotRenderProject()));
+ KAction* projectClean = new KAction(KIcon("edit-clear"), i18n("Clean Project"), this);
+ collection->addAction("project_clean", projectClean);
+ connect(projectClean, SIGNAL(triggered(bool)), this, SLOT(slotCleanProject()));
+
KAction* monitorPlay = new KAction(KIcon("media-playback-start"), i18n("Play"), this);
KShortcut playShortcut;
playShortcut.setPrimary(Qt::Key_Space);
profileName = KdenliveSettings::default_profile();
projectFolder = KdenliveSettings::defaultprojectfolder();
} else {
- ProjectSettings *w = new ProjectSettings(projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, this);
+ ProjectSettings *w = new ProjectSettings(NULL, projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this);
if (w->exec() != QDialog::Accepted) return;
if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
KdenliveSettings::setVideothumbnails(w->enableVideoThumbs());
void MainWindow::slotEditProjectSettings()
{
QPoint p = m_activeDocument->getTracksCount();
- ProjectSettings *w = new ProjectSettings(p.x(), p.y(), m_activeDocument->projectFolder().path(), true, this);
+ ProjectSettings *w = new ProjectSettings(m_activeDocument->clipManager(), p.x(), p.y(), m_activeDocument->projectFolder().path(), true, !m_activeDocument->isModified(), this);
if (w->exec() == QDialog::Accepted) {
+ if (w->deleteUnused()) {
+ // we are going to trash the unused clips
+ m_projectList->trashUnusedClips();
+ }
QString profile = w->selectedProfile();
m_activeDocument->setProjectFolder(w->selectedFolder());
if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path(KUrl::AddTrailingSlash));
m_effectStack->slotClipItemSelected(NULL, 0);
m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false);
m_clipMonitor->slotSetXml(NULL, 0);
- m_activeDocument->setProfilePath(profile);
+ bool updateFps = m_activeDocument->setProfilePath(profile);
KdenliveSettings::setCurrent_profile(profile);
KdenliveSettings::setProject_fps(m_activeDocument->fps());
setCaption(m_activeDocument->description(), m_activeDocument->isModified());
m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description());
//m_activeDocument->clipManager()->resetProducersList(m_projectMonitor->render->producersList());
if (dar != m_activeDocument->dar()) m_projectList->reloadClipThumbnails();
- m_activeTimeline->updateProjectFps();
-
+ if (updateFps) m_activeTimeline->updateProjectFps();
+ m_activeDocument->setModified(true);
+ m_commandStack->activeStack()->clear();
// We need to desactivate & reactivate monitors to get a refresh
//m_monitorManager->switchMonitors();
}
delete w;
}
+
void MainWindow::slotRenderProject()
{
if (!m_renderWidget) {
if (m_renderWidget) m_renderWidget->setRenderStatus(url, status, error);
}
+void MainWindow::slotCleanProject()
+{
+ if (KMessageBox::warningContinueCancel(this, i18n("This will remove all unused clips from your project."), i18n("Clean up project")) == KMessageBox::Cancel) return;
+ m_projectList->cleanup();
+}
+
void MainWindow::slotUpdateMousePosition(int pos)
{
if (m_activeDocument)
disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
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&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
m_effectStack->clear();
}
//m_activeDocument->setRenderer(NULL);
connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
+ connect(trackView->projectView(), SIGNAL(updateClipMarkers(DocClipBase *)), this, SLOT(slotUpdateClipMarkers(DocClipBase*)));
+
connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView()));
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 *)));
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(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&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
+
trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup);
m_activeTimeline = trackView;
}
}
+void MainWindow::slotUpdateClipMarkers(DocClipBase *clip)
+{
+ if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
+ m_clipMonitor->updateMarkers(clip);
+}
+
void MainWindow::slotAddClipMarker()
{
DocClipBase *clip = NULL;
if (m_activeTimeline) {
ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor();
if (item) {
- pos = (m_projectMonitor->position() - item->startPos() + item->cropStart()) / item->speed();
+ pos = GenTime((int)((m_projectMonitor->position() - item->startPos() + item->cropStart()).frames(m_activeDocument->fps()) * item->speed() + 0.5), m_activeDocument->fps());
clip = item->baseClip();
}
}
if (d.exec() == QDialog::Accepted) {
m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment());
}
- if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
}
void MainWindow::slotDeleteClipMarker()
return;
}
m_activeTimeline->projectView()->slotDeleteClipMarker(comment, id, pos);
- if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
-
}
void MainWindow::slotDeleteAllClipMarkers()
return;
}
m_activeTimeline->projectView()->slotDeleteAllClipMarkers(clip->getId());
- if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
}
void MainWindow::slotEditClipMarker()
// remove old marker
m_activeTimeline->projectView()->slotAddClipMarker(id, pos, QString());
}
- if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
}
}
}
}
+void MainWindow::slotSetZoom(int value)
+{
+ m_zoomSlider->setValue(value);
+}
+
void MainWindow::slotGotProgressInfo(const QString &message, int progress)
{
m_statusProgressBar->setValue(progress);
EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true);
m_activeDocument->commandStack()->push(command);
- //m_projectList->slotUpdateClipProperties(dia.clipId(), dia.properties());
if (dia.needsTimelineRefresh()) {
// update clip occurences in timeline
- m_activeTimeline->projectView()->slotUpdateClip(clip->getId());
+ m_activeTimeline->projectView()->slotUpdateClip(clip->getId(), dia.needsTimelineReload());
}
}
}
void MainWindow::slotDvdWizard(const QString &url, const QString &profile)
{
- DvdWizard *w = new DvdWizard(url, profile, this);
- w->exec();
+ DvdWizard w(url, profile, this);
+ w.exec();
}
void MainWindow::slotShowTimeline(bool show)
projects / kdenlive / blobdiff