From: <j-...@us...> - 2009-03-13 17:20:35
|
Revision: 3154 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3154&view=rev Author: j-b-m Date: 2009-03-13 17:20:26 +0000 (Fri, 13 Mar 2009) Log Message: ----------- Fix show/hide of in/out points in monitor overlay Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2009-03-13 16:58:37 UTC (rev 3153) +++ trunk/kdenlive/src/monitor.cpp 2009-03-13 17:20:26 UTC (rev 3154) @@ -167,9 +167,10 @@ m_configMenu->addAction(setThumbFrame); } - QAction *showTips = m_contextMenu->addAction(KIcon("help-hint"), i18n("Monitor overlay infos"), this, SLOT(slotSwitchMonitorInfo(bool))); + QAction *showTips = m_contextMenu->addAction(KIcon("help-hint"), i18n("Monitor overlay infos")); showTips->setCheckable(true); - slotSwitchMonitorInfo(KdenliveSettings::displayMonitorInfo()); + connect(showTips, SIGNAL(toggled(bool)), this, SLOT(slotSwitchMonitorInfo(bool))); + showTips->setChecked(KdenliveSettings::displayMonitorInfo()); m_configMenu->addAction(showTips); } @@ -676,7 +677,7 @@ m_overlay = new Overlay(m_monitorRefresh); m_overlay->raise(); m_overlay->setHidden(true); - } else { + } else if (m_overlay) { delete m_overlay; m_overlay = NULL; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xz...@us...> - 2009-05-11 09:25:28
|
Revision: 3371 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3371&view=rev Author: xzhayon Date: 2009-05-11 09:25:18 +0000 (Mon, 11 May 2009) Log Message: ----------- fix backward seeking on freebsd: http://www.kdenlive.org/mantis/view.php?id=491 Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2009-05-09 14:54:54 UTC (rev 3370) +++ trunk/kdenlive/src/monitor.cpp 2009-05-11 09:25:18 UTC (rev 3371) @@ -537,8 +537,12 @@ activateMonitor(); render->play(0); if (m_position < 1) return; - m_position -= diff; - m_position = qMax(m_position, 0); + /* + * freebsd needs this hack to upgrade m_position value: + * http://www.kdenlive.org/mantis/view.php?id=491 + */ + int position = m_position - diff; + m_position = qMax(position, 0); render->seekToFrame(m_position); emit renderPosition(m_position); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-25 16:03:51
|
Revision: 3417 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3417&view=rev Author: j-b-m Date: 2009-05-25 16:03:45 +0000 (Mon, 25 May 2009) Log Message: ----------- change focus to timeline when enter pressed in monitor timecode widget: http://www.kdenlive.org:80/mantis/view.php?id=848 Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2009-05-25 15:09:24 UTC (rev 3416) +++ trunk/kdenlive/src/monitor.cpp 2009-05-25 16:03:45 UTC (rev 3417) @@ -460,6 +460,7 @@ render->seekToFrame(pos); emit renderPosition(m_position); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + m_timePos->clearFocus(); } void Monitor::checkOverlay() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-25 18:37:50
|
Revision: 3418 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3418&view=rev Author: j-b-m Date: 2009-05-25 18:37:44 +0000 (Mon, 25 May 2009) Log Message: ----------- real fix for focus issue: http://www.kdenlive.org:80/mantis/view.php?id=848 Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2009-05-25 16:03:45 UTC (rev 3417) +++ trunk/kdenlive/src/monitor.cpp 2009-05-25 18:37:44 UTC (rev 3418) @@ -460,7 +460,6 @@ render->seekToFrame(pos); emit renderPosition(m_position); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); - m_timePos->clearFocus(); } void Monitor::checkOverlay() @@ -579,6 +578,7 @@ m_position = pos; m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); m_ruler->slotNewValue(pos); + m_timePos->clearFocus(); } void Monitor::rendererStopped(int pos) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-14 14:38:34
|
Revision: 3536 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3536&view=rev Author: j-b-m Date: 2009-06-14 14:37:57 +0000 (Sun, 14 Jun 2009) Log Message: ----------- Fix typo Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2009-06-14 14:33:09 UTC (rev 3535) +++ trunk/kdenlive/src/monitor.cpp 2009-06-14 14:37:57 UTC (rev 3536) @@ -548,7 +548,7 @@ int position = m_position - diff; m_position = qMax(position, 0); render->seekToFrame(m_position); - emit renderPosition(m_position) + emit renderPosition(m_position); } void Monitor::slotForwardOneFrame(int diff) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-20 01:00:45
|
Revision: 3600 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3600&view=rev Author: j-b-m Date: 2009-06-20 00:59:37 +0000 (Sat, 20 Jun 2009) Log Message: ----------- In clip monitor, go back to beginning when playing arrived at the end of clip: http://kdenlive.org/mantis/view.php?id=889 Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2009-06-19 21:58:27 UTC (rev 3599) +++ trunk/kdenlive/src/monitor.cpp 2009-06-20 00:59:37 UTC (rev 3600) @@ -580,7 +580,13 @@ void Monitor::rendererStopped(int pos) { - //int rulerPos = (int)(pos * m_scale); + if (m_currentClip != NULL && m_playAction->isChecked()) { + // Clip monitor + if (pos >= m_length - 1) { + slotStart(); + return; + } + } m_ruler->slotNewValue(pos); m_position = pos; checkOverlay(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-08-30 09:17:55
|
Revision: 3863 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3863&view=rev Author: j-b-m Date: 2009-08-30 09:17:47 +0000 (Sun, 30 Aug 2009) Log Message: ----------- Fix seeking from monitor timecode when in frame mode, change the direction of mouse wheel event to be similar to the timeline ruler seeking Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2009-08-29 21:59:44 UTC (rev 3862) +++ trunk/kdenlive/src/monitor.cpp 2009-08-30 09:17:47 UTC (rev 3863) @@ -107,7 +107,10 @@ m_timePos = new KRestrictedLine(this); m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); m_frametimecode = KdenliveSettings::frametimecode(); - if (m_frametimecode) m_timePos->setInputMask("999999999"); + if (m_frametimecode) { + m_timePos->setInputMask(QString()); + m_timePos->setValidator(new QIntValidator(this)); + } else m_timePos->setInputMask("99:99:99:99"); toolbar->addWidget(m_timePos); @@ -428,10 +431,10 @@ { if (event->modifiers() == Qt::ControlModifier) { int delta = m_monitorManager->timecode().fps(); - if (event->delta() < 0) delta = 0 - delta; + if (event->delta() > 0) delta = 0 - delta; slotSeek(render->seekFramePosition() - delta); } else { - if (event->delta() <= 0) slotForwardOneFrame(); + if (event->delta() >= 0) slotForwardOneFrame(); else slotRewindOneFrame(); } } @@ -479,6 +482,7 @@ int frames; if (m_frametimecode) frames = m_timePos->text().toInt(); else frames = m_monitorManager->timecode().getFrameCount(m_timePos->text()); + kDebug()<<"// / / SEEK TO: "<<frames; slotSeek(frames); } @@ -786,10 +790,12 @@ m_frametimecode = KdenliveSettings::frametimecode(); if (m_frametimecode) { int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text()); - m_timePos->setInputMask("999999999"); + m_timePos->setValidator(new QIntValidator(this)); + m_timePos->setInputMask(QString()); m_timePos->setText(QString::number(frames)); } else { int pos = m_timePos->text().toInt(); + m_timePos->setValidator(0); m_timePos->setInputMask("99:99:99:99"); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-09-07 20:30:01
|
Revision: 3878 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3878&view=rev Author: j-b-m Date: 2009-09-07 20:29:53 +0000 (Mon, 07 Sep 2009) Log Message: ----------- Fix compilation Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2009-09-06 13:36:00 UTC (rev 3877) +++ trunk/kdenlive/src/monitor.cpp 2009-09-07 20:29:53 UTC (rev 3878) @@ -38,6 +38,7 @@ #include <QToolBar> #include <QDesktopWidget> #include <QLabel> +#include <QIntValidator> Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-09-22 10:10:04
|
Revision: 3920 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3920&view=rev Author: j-b-m Date: 2009-09-22 10:09:57 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Put markers menu also in clip monitor context menu http://kdenlive.org/mantis/view.php?id=1135 Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2009-09-22 09:57:57 UTC (rev 3919) +++ trunk/kdenlive/src/monitor.cpp 2009-09-22 10:09:57 UTC (rev 3920) @@ -194,8 +194,10 @@ m_playMenu->addAction(loopZone); //TODO: add save zone to timeline monitor when fixed - if (m_name == "clip") m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone())); - + if (m_name == "clip") { + m_contextMenu->addMenu(m_markerMenu); + m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone())); + } QAction *extractFrame = m_configMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame())); m_contextMenu->addAction(extractFrame); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-08-01 08:37:19
|
Revision: 4675 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4675&view=rev Author: j-b-m Date: 2010-08-01 08:37:14 +0000 (Sun, 01 Aug 2010) Log Message: ----------- remove back and forward one frame buttons in monitors, since it can also be achieved through mouse wheel in monitor and arrows in the timecode widget Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2010-08-01 07:25:26 UTC (rev 4674) +++ trunk/kdenlive/src/monitor.cpp 2010-08-01 08:37:14 UTC (rev 4675) @@ -76,7 +76,7 @@ } toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind())); - toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame())); + //toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame())); QToolButton *playButton = new QToolButton(toolbar); m_playMenu = new QMenu(i18n("Play..."), this); @@ -88,7 +88,7 @@ playButton->setPopupMode(QToolButton::MenuButtonPopup); toolbar->addWidget(playButton); - toolbar->addAction(KIcon("media-skip-forward"), i18n("Forward 1 frame"), this, SLOT(slotForwardOneFrame())); + //toolbar->addAction(KIcon("media-skip-forward"), i18n("Forward 1 frame"), this, SLOT(slotForwardOneFrame())); toolbar->addAction(KIcon("media-seek-forward"), i18n("Forward"), this, SLOT(slotForward())); playButton->setDefaultAction(m_playAction); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2010-08-14 19:35:26
|
Revision: 4716 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4716&view=rev Author: ddennedy Date: 2010-08-14 19:35:18 +0000 (Sat, 14 Aug 2010) Log Message: ----------- Fix crash in OS X with on-monitor effects. On-monitor effects does not work in OS X, but now with it enabled it does not immediately crash. Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2010-08-13 20:54:16 UTC (rev 4715) +++ trunk/kdenlive/src/monitor.cpp 2010-08-14 19:35:18 UTC (rev 4716) @@ -839,7 +839,7 @@ void Monitor::slotEffectScene(bool show) { - if (m_name == "project" && !m_delStage) { + if (m_name == "project" && !m_delStage && m_monitorRefresh) { m_monitorRefresh->setVisible(!show); m_effectView->setVisible(show); if (show) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2010-08-14 21:02:52
|
Revision: 4717 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4717&view=rev Author: ddennedy Date: 2010-08-14 21:02:46 +0000 (Sat, 14 Aug 2010) Log Message: ----------- Make on-monitor effects work on OS X. Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2010-08-14 19:35:18 UTC (rev 4716) +++ trunk/kdenlive/src/monitor.cpp 2010-08-14 21:02:46 UTC (rev 4717) @@ -839,8 +839,9 @@ void Monitor::slotEffectScene(bool show) { - if (m_name == "project" && !m_delStage && m_monitorRefresh) { - m_monitorRefresh->setVisible(!show); + if (m_name == "project" && !m_delStage) { + if (m_monitorRefresh) + m_monitorRefresh->setVisible(!show); m_effectView->setVisible(show); if (show) m_effectScene->slotUpdateBackground(true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2010-08-14 21:07:36
|
Revision: 4718 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4718&view=rev Author: ddennedy Date: 2010-08-14 21:07:30 +0000 (Sat, 14 Aug 2010) Log Message: ----------- On OS X, fix the split-screen side-effect with on-monitor effects. Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2010-08-14 21:02:46 UTC (rev 4717) +++ trunk/kdenlive/src/monitor.cpp 2010-08-14 21:07:30 UTC (rev 4718) @@ -840,8 +840,11 @@ void Monitor::slotEffectScene(bool show) { if (m_name == "project" && !m_delStage) { - if (m_monitorRefresh) - m_monitorRefresh->setVisible(!show); +#ifdef Q_WS_MAC + m_glWidget->setVisible(!show); +#else + m_monitorRefresh->setVisible(!show); +#endif m_effectView->setVisible(show); if (show) m_effectScene->slotUpdateBackground(true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tt...@us...> - 2010-09-05 13:09:56
|
Revision: 4841 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4841&view=rev Author: ttill Date: 2010-09-05 13:09:50 +0000 (Sun, 05 Sep 2010) Log Message: ----------- Do not start playback when clicking on the edge of the monitor scene (visible when editing effects on the monitor) Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2010-09-05 12:55:53 UTC (rev 4840) +++ trunk/kdenlive/src/monitor.cpp 2010-09-05 13:09:50 UTC (rev 4841) @@ -397,7 +397,7 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event) { if (m_dragStarted) { - if (m_ui.video_frame->underMouse()) { + if (m_ui.video_frame->underMouse() && (!m_effectView || !m_effectView->isVisible())) { if (isActive()) slotPlay(); else activateMonitor(); } else QWidget::mouseReleaseEvent(event); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-09-29 16:33:45
|
Revision: 4953 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4953&view=rev Author: j-b-m Date: 2010-09-29 16:33:38 +0000 (Wed, 29 Sep 2010) Log Message: ----------- Split view in project monitor seems to work fine on OpenGL monitors too... don't see a reason to disable it for Mac Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2010-09-29 14:38:01 UTC (rev 4952) +++ trunk/kdenlive/src/monitor.cpp 2010-09-29 16:33:38 UTC (rev 4953) @@ -252,14 +252,9 @@ m_contextMenu->addAction(extractFrame); if (m_name != "clip") { -#if defined(Q_WS_MAC) || defined(USE_OPEN_GL) - // TODO: why disable in OpenGL? - // Don't show split action -#else QAction *splitView = m_contextMenu->addAction(KIcon("view-split-left-right"), i18n("Split view"), render, SLOT(slotSplitView(bool))); splitView->setCheckable(true); m_configMenu->addAction(splitView); -#endif } else { QAction *setThumbFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Set current image as thumbnail"), this, SLOT(slotSetThumbFrame())); m_configMenu->addAction(setThumbFrame); @@ -956,6 +951,7 @@ if (m_renderer) m_renderer->doRefresh(); } + Overlay::Overlay(QWidget* parent) : QLabel(parent) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-10-17 10:34:09
|
Revision: 5012 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5012&view=rev Author: j-b-m Date: 2010-10-17 10:34:03 +0000 (Sun, 17 Oct 2010) Log Message: ----------- Cleanup monitor UI (smaller toolbar icons) Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2010-10-16 15:53:09 UTC (rev 5011) +++ trunk/kdenlive/src/monitor.cpp 2010-10-17 10:34:03 UTC (rev 5012) @@ -66,6 +66,7 @@ { QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(0); // Video widget holder m_videoBox = new VideoContainer(this); @@ -74,13 +75,14 @@ layout->addWidget(m_videoBox, 10); layout->addStretch(); + // Get base size for icons + int s = style()->pixelMetric(QStyle::PM_SmallIconSize); + // Monitor ruler layout->addWidget(m_ruler); - // Tool bar buttons QToolBar *toolbar = new QToolBar(name, this); - QVBoxLayout *layout2 = new QVBoxLayout; - layout2->setContentsMargins(0, 0, 0, 0); + toolbar->setIconSize(QSize(s, s)); m_playIcon = KIcon("media-playback-start"); m_pauseIcon = KIcon("media-playback-pause"); @@ -134,6 +136,7 @@ m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this); toolbar->addWidget(m_timePos); connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek())); + toolbar->setMaximumHeight(s * 1.5); layout->addWidget(toolbar); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-10-17 10:38:23
|
Revision: 5013 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5013&view=rev Author: j-b-m Date: 2010-10-17 10:38:17 +0000 (Sun, 17 Oct 2010) Log Message: ----------- Fix monitor layout issue Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2010-10-17 10:34:03 UTC (rev 5012) +++ trunk/kdenlive/src/monitor.cpp 2010-10-17 10:38:17 UTC (rev 5013) @@ -71,7 +71,7 @@ // Video widget holder m_videoBox = new VideoContainer(this); m_videoBox->setContentsMargins(0, 0, 0, 0); - m_videoBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_videoBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); layout->addWidget(m_videoBox, 10); layout->addStretch(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2010-10-17 18:35:29
|
Revision: 5018 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5018&view=rev Author: ddennedy Date: 2010-10-17 18:35:23 +0000 (Sun, 17 Oct 2010) Log Message: ----------- Fix build on Mac OS X. Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2010-10-17 14:09:16 UTC (rev 5017) +++ trunk/kdenlive/src/monitor.cpp 2010-10-17 18:35:23 UTC (rev 5018) @@ -165,7 +165,7 @@ bool monitorCreated = false; #ifdef Q_WS_MAC - createOpenGlWidget(videoBox, profile); + createOpenGlWidget(m_videoBox, profile); monitorCreated = true; //m_glWidget->setFixedSize(width, height); #elif defined (USE_OPEN_GL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <g-...@us...> - 2011-01-02 17:40:58
|
Revision: 5241 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5241&view=rev Author: g-marco Date: 2011-01-02 17:40:51 +0000 (Sun, 02 Jan 2011) Log Message: ----------- use m_glwidget only when USE_OPEN_GL is enabled Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2011-01-02 16:27:37 UTC (rev 5240) +++ trunk/kdenlive/src/monitor.cpp 2011-01-02 17:40:51 UTC (rev 5241) @@ -181,10 +181,13 @@ m_videoBox->setLayout(lay); render = new Render(m_name, (int) m_monitorRefresh->winId(), profile, this); m_monitorRefresh->setRenderer(render); - }else if (m_glWidget) { + } +#if defined (USE_OPEN_GL) + else if (m_glWidget) { lay->addWidget(m_glWidget); m_videoBox->setLayout(lay); } +#endif connect(m_audioSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSetVolume(int))); connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tt...@us...> - 2011-03-05 22:51:30
|
Revision: 5480 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5480&view=rev Author: ttill Date: 2011-03-05 22:51:24 +0000 (Sat, 05 Mar 2011) Log Message: ----------- rotoscoping: prevent context menu when closing the spline using right mouse button Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2011-03-05 22:24:14 UTC (rev 5479) +++ trunk/kdenlive/src/monitor.cpp 2011-03-05 22:51:24 UTC (rev 5480) @@ -456,7 +456,9 @@ m_dragStarted = true; m_DragStartPosition = event->pos(); } - } else m_contextMenu->popup(event->globalPos()); + } else if (!m_effectWidget || !m_effectWidget->isVisible()) { + m_contextMenu->popup(event->globalPos()); + } } void Monitor::slotSwitchFullScreen() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-10-03 10:28:25
|
Revision: 5941 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5941&view=rev Author: j-b-m Date: 2011-10-03 10:28:19 +0000 (Mon, 03 Oct 2011) Log Message: ----------- small cleanup Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2011-10-03 10:25:04 UTC (rev 5940) +++ trunk/kdenlive/src/monitor.cpp 2011-10-03 10:28:19 UTC (rev 5941) @@ -712,9 +712,6 @@ checkOverlay(); m_timePos->setValue(pos); } - disconnect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); - //m_playAction->setChecked(false); - connect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); m_playAction->setIcon(m_playIcon); } @@ -769,11 +766,9 @@ if (render == NULL) return; activateMonitor(); if (render->playSpeed() == 0) { - //m_playAction->setChecked(true); m_playAction->setIcon(m_pauseIcon); render->switchPlay(true); } else { - //m_playAction->setChecked(false); m_playAction->setIcon(m_playIcon); render->switchPlay(false); } @@ -818,7 +813,9 @@ render->setProducer(NULL, -1); return; } - if (m_currentClip != NULL || clip != NULL) activateMonitor(); + if (m_currentClip != NULL || clip != NULL) { + activateMonitor(); + } if (clip != m_currentClip) { m_currentClip = clip; updateMarkers(clip); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-10-24 16:51:37
|
Revision: 5986 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5986&view=rev Author: j-b-m Date: 2011-10-24 16:51:27 +0000 (Mon, 24 Oct 2011) Log Message: ----------- Do not trigger monitor refresh when hidden Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2011-10-24 09:08:35 UTC (rev 5985) +++ trunk/kdenlive/src/monitor.cpp 2011-10-24 16:51:27 UTC (rev 5986) @@ -732,7 +732,7 @@ void Monitor::start() { - if (render && (m_name != "clip" || m_currentClip != NULL)) render->start(); + if (render) render->start(); connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); } @@ -806,7 +806,7 @@ void Monitor::updateClipProducer(Mlt::Producer *prod) { if (render == NULL) return; - render->setProducer(prod, render->seekFramePosition()); + render->setProducer(prod, render->seekFramePosition()); } void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, int position) @@ -819,6 +819,7 @@ render->setProducer(NULL, -1); return; } + if (clip != m_currentClip) { m_currentClip = clip; if (m_currentClip) activateMonitor(); @@ -1054,7 +1055,7 @@ void MonitorRefresh::resizeEvent(QResizeEvent *event) { Q_UNUSED(event); - if (m_renderer) m_renderer->doRefresh(); + if (m_renderer && isVisible()) m_renderer->doRefresh(); } Overlay::Overlay(QWidget* parent) : This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |