svn path=/trunk/kdenlive/; revision=4562
int newpos = (int) pos.frames(m_fps);
int start = cropStart().frames(m_fps);
int end = (cropStart() + cropDuration()).frames(m_fps) - 1;
int newpos = (int) pos.frames(m_fps);
int start = cropStart().frames(m_fps);
int end = (cropStart() + cropDuration()).frames(m_fps) - 1;
- if (editedKeyFramePos() > start && newpos <= start) newpos = start + 1;
- if (editedKeyFramePos() < end && newpos >= end) newpos = end - 1;
+ if (editedKeyFramePos() > start && newpos <= start)
+ newpos = start + 1;
+ if (editedKeyFramePos() < end && newpos >= end)
+ newpos = end - 1;
newpos = qMax(newpos, start);
newpos = qMin(newpos, end);
double newval = qMax(value, 0.0);
newval = qMin(newval, 100.0);
newval = newval / m_keyframeFactor;
newpos = qMax(newpos, start);
newpos = qMin(newpos, end);
double newval = qMax(value, 0.0);
newval = qMin(newval, 100.0);
newval = newval / m_keyframeFactor;
- if (m_editedKeyframe != newpos) m_keyframes.remove(m_editedKeyframe);
+ if (m_editedKeyframe != newpos)
+ m_keyframes.remove(m_editedKeyframe);
m_keyframes[newpos] = (int) newval;
m_editedKeyframe = newpos;
update();
m_keyframes[newpos] = (int) newval;
m_editedKeyframe = newpos;
update();
for (int i = 0; i < children.count(); i++) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int i = 0; i < children.count(); i++) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
- for (int j = 0; j < subchildren.count(); j++) {
+ for (int j = 0; j < subchildren.count(); j++)
collidingItems.removeAll(subchildren.at(j));
collidingItems.removeAll(subchildren.at(j));
}
collidingItems.removeAll(children.at(i));
}
}
collidingItems.removeAll(children.at(i));
}
for (int i = 0; i < children.count(); i++) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int i = 0; i < children.count(); i++) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
- for (int j = 0; j < subchildren.count(); j++) {
+ for (int j = 0; j < subchildren.count(); j++)
collidingItems.removeAll(subchildren.at(j));
collidingItems.removeAll(subchildren.at(j));
}
collidingItems.removeAll(children.at(i));
}
}
collidingItems.removeAll(children.at(i));
}
for (int i = 0; i < children.count(); i++) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int i = 0; i < children.count(); i++) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
- for (int j = 0; j < subchildren.count(); j++) {
+ for (int j = 0; j < subchildren.count(); j++)
collidingItems.removeAll(subchildren.at(j));
collidingItems.removeAll(subchildren.at(j));
}
collidingItems.removeAll(children.at(i));
}
}
collidingItems.removeAll(children.at(i));
}
for (int i = 0; i < children.count(); i++) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int i = 0; i < children.count(); i++) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
- for (int j = 0; j < subchildren.count(); j++) {
+ for (int j = 0; j < subchildren.count(); j++)
collidingItems.removeAll(subchildren.at(j));
collidingItems.removeAll(subchildren.at(j));
}
collidingItems.removeAll(children.at(i));
}
}
collidingItems.removeAll(children.at(i));
}
if ((val < -50 || val > 150) && item->editedKeyFramePos() != start && item->editedKeyFramePos() != end) {
//delete keyframe
item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), -1, 0);
if ((val < -50 || val > 150) && item->editedKeyFramePos() != start && item->editedKeyFramePos() != end) {
//delete keyframe
item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), -1, 0);
- } else item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), item->editedKeyFramePos(), item->editedKeyFrameValue());
+ } else {
+ item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), item->editedKeyFramePos(), item->editedKeyFrameValue());
+ }
QDomElement newEffect = item->selectedEffect().cloneNode().toElement();
//item->updateKeyframeEffect();
QDomElement newEffect = item->selectedEffect().cloneNode().toElement();
//item->updateKeyframeEffect();
int diff = sceneRect().width() - m_projectDuration;
if (diff * newmatrix.m11() < 50) {
int diff = sceneRect().width() - m_projectDuration;
if (diff * newmatrix.m11() < 50) {
- if (newmatrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / newmatrix.m11()), sceneRect().height());
- else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height());
+ if (newmatrix.m11() < 0.4)
+ setSceneRect(0, 0, (m_projectDuration + 100 / newmatrix.m11()), sceneRect().height());
+ else
+ setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height());
}
centerOn(QPointF(cursorPos(), verticalPos));
}
}
centerOn(QPointF(cursorPos(), verticalPos));
}
void CustomTrackView::slotRefreshGuides()
{
if (KdenliveSettings::showmarkers()) {
void CustomTrackView::slotRefreshGuides()
{
if (KdenliveSettings::showmarkers()) {
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); i++)
m_guides.at(i)->update();
m_guides.at(i)->update();
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); i++)
m_searchPoints.append(m_guides.at(i)->info());
m_searchPoints.append(m_guides.at(i)->info());
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
- if (item->clipProducer() == clipId) {
+ if (item->clipProducer() == clipId)
matchingInfo << item->info();
matchingInfo << item->info();
KdenliveSettings::setRendererpath(mltPath + "/bin/melt");
}
KdenliveSettings::setRendererpath(mltPath + "/bin/melt");
}
- if (KdenliveSettings::mltpath().isEmpty()) {
+ if (KdenliveSettings::mltpath().isEmpty())
KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/"));
KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/"));
if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::rendererpath().endsWith("inigo")) {
QString meltPath = QString(MLT_PREFIX) + QString("/bin/melt");
if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::rendererpath().endsWith("inigo")) {
QString meltPath = QString(MLT_PREFIX) + QString("/bin/melt");
void MainWindow::slotCheckRenderStatus()
{
// Make sure there are no missing clips
void MainWindow::slotCheckRenderStatus()
{
// Make sure there are no missing clips
- if (m_renderWidget) m_renderWidget->missingClips(m_projectList->hasMissingClips());
+ if (m_renderWidget)
+ m_renderWidget->missingClips(m_projectList->hasMissingClips());
}
void MainWindow::setRenderingProgress(const QString &url, int progress)
{
}
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)
{
}
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()
}
void MainWindow::slotCleanProject()
void MainWindow::slotGuidesUpdated()
{
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()
}
void MainWindow::slotEditKeys()
m_activeTimeline->refresh();
m_activeTimeline->projectView()->checkAutoScroll();
m_activeTimeline->projectView()->checkTrackHeight();
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_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
void MainWindow::slotSwitchVideoThumbs()
{
KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails());
void MainWindow::slotSwitchVideoThumbs()
{
KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails());
- if (m_activeTimeline) {
m_activeTimeline->projectView()->slotUpdateAllThumbs();
m_activeTimeline->projectView()->slotUpdateAllThumbs();
m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
}
m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
}
if (m_activeTimeline) {
m_activeTimeline->refresh();
m_activeTimeline->projectView()->checkAutoScroll();
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());
}
}
m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
}
void MainWindow::slotSwitchMarkersComments()
{
KdenliveSettings::setShowmarkers(!KdenliveSettings::showmarkers());
void MainWindow::slotSwitchMarkersComments()
{
KdenliveSettings::setShowmarkers(!KdenliveSettings::showmarkers());
- if (m_activeTimeline) {
m_activeTimeline->refresh();
m_activeTimeline->refresh();
m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers());
}
m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers());
}
void MainWindow::slotUpdateClipMarkers(DocClipBase *clip)
{
void MainWindow::slotUpdateClipMarkers(DocClipBase *clip)
{
- if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
+ if (m_clipMonitor->isActive())
+ m_clipMonitor->checkOverlay();
m_clipMonitor->updateMarkers(clip);
}
m_clipMonitor->updateMarkers(clip);
}
QString id = clip->getId();
CommentedTime marker(pos, i18n("Marker"));
MarkerDialog d(clip, marker, m_activeDocument->timecode(), i18n("Add Marker"), this);
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());
m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment());
}
void MainWindow::slotDeleteClipMarker()
}
void MainWindow::slotDeleteClipMarker()
void MainWindow::slotCutTimelineClip()
{
void MainWindow::slotCutTimelineClip()
{
- if (m_activeTimeline) {
m_activeTimeline->projectView()->cutSelectedClips();
m_activeTimeline->projectView()->cutSelectedClips();
}
void MainWindow::slotInsertClipOverwrite()
}
void MainWindow::slotInsertClipOverwrite()
void MainWindow::slotSelectTimelineClip()
{
void MainWindow::slotSelectTimelineClip()
{
- if (m_activeTimeline) {
m_activeTimeline->projectView()->selectClip(true);
m_activeTimeline->projectView()->selectClip(true);
}
void MainWindow::slotSelectTimelineTransition()
{
}
void MainWindow::slotSelectTimelineTransition()
{
- if (m_activeTimeline) {
m_activeTimeline->projectView()->selectTransition(true);
m_activeTimeline->projectView()->selectTransition(true);
}
void MainWindow::slotDeselectTimelineClip()
{
}
void MainWindow::slotDeselectTimelineClip()
{
- if (m_activeTimeline) {
m_activeTimeline->projectView()->selectClip(false, true);
m_activeTimeline->projectView()->selectClip(false, true);
}
void MainWindow::slotDeselectTimelineTransition()
{
}
void MainWindow::slotDeselectTimelineTransition()
{
- if (m_activeTimeline) {
m_activeTimeline->projectView()->selectTransition(false, true);
m_activeTimeline->projectView()->selectTransition(false, true);
}
void MainWindow::slotSelectAddTimelineClip()
{
}
void MainWindow::slotSelectAddTimelineClip()
{
- if (m_activeTimeline) {
m_activeTimeline->projectView()->selectClip(true, true);
m_activeTimeline->projectView()->selectClip(true, true);
}
void MainWindow::slotSelectAddTimelineTransition()
{
}
void MainWindow::slotSelectAddTimelineTransition()
{
- if (m_activeTimeline) {
m_activeTimeline->projectView()->selectTransition(true, true);
m_activeTimeline->projectView()->selectTransition(true, true);
}
void MainWindow::slotGroupClips()
{
}
void MainWindow::slotGroupClips()
{
- if (m_activeTimeline) {
m_activeTimeline->projectView()->groupClips();
m_activeTimeline->projectView()->groupClips();
}
void MainWindow::slotUnGroupClips()
{
}
void MainWindow::slotUnGroupClips()
{
- if (m_activeTimeline) {
m_activeTimeline->projectView()->groupClips(false);
m_activeTimeline->projectView()->groupClips(false);
}
void MainWindow::slotEditItemDuration()
{
}
void MainWindow::slotEditItemDuration()
{
- if (m_activeTimeline) {
m_activeTimeline->projectView()->editItemDuration();
m_activeTimeline->projectView()->editItemDuration();
}
void MainWindow::slotAddProjectClip(KUrl url)
}
void MainWindow::slotAddProjectClip(KUrl url)
void MainWindow::slotFitZoom()
{
void MainWindow::slotFitZoom()
{
- if (m_activeTimeline) {
m_zoomSlider->setValue(m_activeTimeline->fitZoom());
m_zoomSlider->setValue(m_activeTimeline->fitZoom());
}
void MainWindow::slotSetZoom(int value)
}
void MainWindow::slotSetZoom(int value)
{
m_statusProgressBar->setValue(progress);
if (progress >= 0) {
{
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) {
m_statusProgressBar->setVisible(true);
} else if (progress == -2) {
- if (!message.isEmpty()) m_messageLabel->setMessage(message, ErrorMessage);
+ if (!message.isEmpty())
+ m_messageLabel->setMessage(message, ErrorMessage);
m_statusProgressBar->setVisible(false);
} else {
m_messageLabel->setMessage(QString(), DefaultMessage);
m_statusProgressBar->setVisible(false);
} else {
m_messageLabel->setMessage(QString(), DefaultMessage);
new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true, command);
}
m_activeDocument->commandStack()->push(command);
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++) {
+ for (int i = 0; i < cliplist.count(); i++)
m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia.needsTimelineReload());
m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia.needsTimelineReload());
}
}
void MainWindow::customEvent(QEvent* e)
{
}
}
void MainWindow::customEvent(QEvent* e)
{
- if (e->type() == QEvent::User) {
+ if (e->type() == QEvent::User)
m_messageLabel->setMessage(static_cast <MltErrorEvent *>(e)->message(), MltError);
m_messageLabel->setMessage(static_cast <MltErrorEvent *>(e)->message(), MltError);
}
void MainWindow::slotActivateEffectStackView()
{
}
void MainWindow::slotActivateEffectStackView()
{
void MainWindow::slotActivateTransitionView(Transition *t)
{
void MainWindow::slotActivateTransitionView(Transition *t)
{
- if (t) m_transitionConfig->raiseWindow(m_transitionConfigDock);
+ if (t)
+ m_transitionConfig->raiseWindow(m_transitionConfigDock);
}
void MainWindow::slotSnapRewind()
}
void MainWindow::slotSnapRewind()
if (m_projectMonitor->isActive()) {
if (m_activeTimeline)
m_activeTimeline->projectView()->slotSeekToPreviousSnap();
if (m_projectMonitor->isActive()) {
if (m_activeTimeline)
m_activeTimeline->projectView()->slotSeekToPreviousSnap();
- } else m_clipMonitor->slotSeekToPreviousSnap();
+ } else {
+ m_clipMonitor->slotSeekToPreviousSnap();
+ }
}
void MainWindow::slotSnapForward()
}
void MainWindow::slotSnapForward()
if (m_projectMonitor->isActive()) {
if (m_activeTimeline)
m_activeTimeline->projectView()->slotSeekToNextSnap();
if (m_projectMonitor->isActive()) {
if (m_activeTimeline)
m_activeTimeline->projectView()->slotSeekToNextSnap();
- } else m_clipMonitor->slotSeekToNextSnap();
+ } else {
+ m_clipMonitor->slotSeekToNextSnap();
+ }
}
void MainWindow::slotClipStart()
}
void MainWindow::slotClipStart()
void MainWindow::slotZoneStart()
{
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()
{
}
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)
{
}
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)
{
}
void MainWindow::slotChangeEdit(QAction * action)
{
- 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);
+ 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)
}
void MainWindow::slotSetTool(PROJECTTOOL tool)
void MainWindow::slotCopy()
{
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()
{
}
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()
{
}
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()
}
void MainWindow::slotFind()
void MainWindow::slotFindNext()
{
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));
statusBar()->showMessage(i18n("Found: %1", m_findString));
statusBar()->showMessage(i18n("Reached end of project"));
statusBar()->showMessage(i18n("Reached end of project"));
m_findTimer.start(4000);
}
m_findTimer.start(4000);
}
{
if (m_activeTimeline) {
const QStringList &clipIds = m_activeTimeline->projectView()->selectedClips();
{
if (m_activeTimeline) {
const QStringList &clipIds = m_activeTimeline->projectView()->selectedClips();
- if (clipIds.isEmpty()) return;
+ if (clipIds.isEmpty())
+ return;
m_projectListDock->raise();
m_projectListDock->raise();
- for (int i = 0; i < clipIds.count(); i++) {
+ for (int i = 0; i < clipIds.count(); i++)
m_projectList->selectItemById(clipIds.at(i));
m_projectList->selectItemById(clipIds.at(i));
if (m_projectMonitor->isActive())
slotSwitchMonitors();
}
if (m_projectMonitor->isActive())
slotSwitchMonitors();
}
if (ke->key() == Qt::Key_Backspace) {
m_findString = m_findString.left(m_findString.length() - 1);
if (ke->key() == Qt::Key_Backspace) {
m_findString = m_findString.left(m_findString.length() - 1);
- if (!m_findString.isEmpty()) {
+ if (!m_findString.isEmpty())
m_findTimer.start(4000);
ke->accept();
m_findTimer.start(4000);
ke->accept();
- } else KXmlGuiWindow::keyPressEvent(ke);
+ } else {
+ KXmlGuiWindow::keyPressEvent(ke);
+ }
if (ke->text().trimmed().isEmpty()) return false;
ke->accept();
return true;
if (ke->text().trimmed().isEmpty()) return false;
ke->accept();
return true;
+ } else {
+ return false;
+ }
} else {
// pass the event on to the parent class
return QMainWindow::eventFilter(obj, event);
} else {
// pass the event on to the parent class
return QMainWindow::eventFilter(obj, event);
vbox->addWidget(url);
vbox->addWidget(label2);
vbox->addWidget(edit);
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()
{
}
void MainWindow::slotSetInPoint()
{
- if (m_clipMonitor->isActive()) {
+ if (m_clipMonitor->isActive())
m_clipMonitor->slotSetZoneStart();
m_clipMonitor->slotSetZoneStart();
- } else m_projectMonitor->slotSetZoneStart();
+ else
+ m_projectMonitor->slotSetZoneStart();
//else m_activeTimeline->projectView()->setInPoint();
}
void MainWindow::slotSetOutPoint()
{
//else m_activeTimeline->projectView()->setInPoint();
}
void MainWindow::slotSetOutPoint()
{
- if (m_clipMonitor->isActive()) {
+ if (m_clipMonitor->isActive())
m_clipMonitor->slotSetZoneEnd();
m_clipMonitor->slotSetZoneEnd();
- } else m_projectMonitor->slotSetZoneEnd();
+ else
+ m_projectMonitor->slotSetZoneEnd();
// else m_activeTimeline->projectView()->setOutPoint();
}
void MainWindow::slotResizeItemStart()
{
// 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()
{
}
void MainWindow::slotResizeItemEnd()
{
- if (m_activeTimeline) m_activeTimeline->projectView()->setOutPoint();
+ if (m_activeTimeline)
+ m_activeTimeline->projectView()->setOutPoint();
}
int MainWindow::getNewStuff(const QString &configFile)
}
int MainWindow::getNewStuff(const QString &configFile)
void MainWindow::slotAutoTransition()
{
void MainWindow::slotAutoTransition()
{
- if (m_activeTimeline) m_activeTimeline->projectView()->autoTransition();
+ if (m_activeTimeline)
+ m_activeTimeline->projectView()->autoTransition();
}
void MainWindow::slotSplitAudio()
{
}
void MainWindow::slotSplitAudio()
{
- if (m_activeTimeline) m_activeTimeline->projectView()->splitAudio();
+ if (m_activeTimeline)
+ m_activeTimeline->projectView()->splitAudio();
}
void MainWindow::slotUpdateClipType(QAction *action)
}
void MainWindow::slotUpdateClipType(QAction *action)
{
m_timelineState = saveState();
QWidget *par = focusWidget()->parentWidget();
{
m_timelineState = saveState();
QWidget *par = focusWidget()->parentWidget();
- while (par->parentWidget() && par->parentWidget() != this) {
+ while (par->parentWidget() && par->parentWidget() != this)
par = par->parentWidget();
par = par->parentWidget();
kDebug() << "CURRENT WIDGET: " << par->objectName();
}
/*else {
kDebug() << "CURRENT WIDGET: " << par->objectName();
}
/*else {
QStringList data = i.value().split(";", QString::SkipEmptyParts);
QAction *a = transMenu->addAction(i.key());
a->setData(data);
QStringList data = i.value().split(";", QString::SkipEmptyParts);
QAction *a = transMenu->addAction(i.key());
a->setData(data);
- if (data.count() > 1) {
a->setToolTip(data.at(1));
a->setToolTip(data.at(1));
connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode()));
}
}
connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode()));
}
}