[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src: Merge branch '16.12'
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-12-02 13:54:45
Message-ID: E1cCoIX-0002Ry-GJ () code ! kde ! org
[Download RAW message or body]

Git commit 32dc21d24712bcdc44cf1e75907679f9bb27cf90 by Jean-Baptiste Mardelle.
Committed on 02/12/2016 at 13:54.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +3    -1    src/doc/documentchecker.cpp
M  +8    -8    src/monitor/glwidget.cpp
M  +2    -2    src/monitor/glwidget.h
M  +14   -2    src/monitor/monitor.cpp
M  +2    -0    src/monitor/monitor.h
M  +20   -15   src/onmonitoritems/rotoscoping/rotowidget.cpp

https://commits.kde.org/kdenlive/32dc21d24712bcdc44cf1e75907679f9bb27cf90

diff --cc src/monitor/monitor.cpp
index ee3bade,3e25684..ff1c1a3
--- a/src/monitor/monitor.cpp
+++ b/src/monitor/monitor.cpp
@@@ -181,16 -182,16 +181,16 @@@ Monitor::Monitor(Kdenlive::MonitorId id
      m_horizontalScroll = new QScrollBar(Qt::Horizontal);
      glayout->addWidget(m_horizontalScroll, 1, 0);
      m_horizontalScroll->hide();
-     connect(m_horizontalScroll, &QAbstractSlider::valueChanged, m_glMonitor, \
                &GLWidget::setOffsetX);
-     connect(m_verticalScroll, &QAbstractSlider::valueChanged, m_glMonitor, \
                &GLWidget::setOffsetY);
 -    connect(m_horizontalScroll, &QScrollBar::valueChanged, this, \
                &Monitor::setOffsetX);
 -    connect(m_verticalScroll, &QScrollBar::valueChanged, this, \
                &Monitor::setOffsetY);
 -    connect(m_glMonitor, SIGNAL(frameDisplayed(const SharedFrame&)), this, \
SLOT(onFrameDisplayed(const SharedFrame&))); ++    connect(m_horizontalScroll, \
&QAbstractSlider::valueChanged, this, &Monitor::setOffsetX); ++    \
connect(m_verticalScroll, &QAbstractSlider::valueChanged, this, \
&Monitor::setOffsetY);  +    connect(m_glMonitor, &GLWidget::frameDisplayed, this, \
                &Monitor::onFrameDisplayed);
      connect(m_glMonitor, SIGNAL(mouseSeek(int,int)), this, \
SLOT(slotMouseSeek(int,int)));  connect(m_glMonitor, SIGNAL(monitorPlay()), this, \
                SLOT(slotPlay()));
 -    connect(m_glMonitor, SIGNAL(startDrag()), this, SLOT(slotStartDrag()));
 +    connect(m_glMonitor, &GLWidget::startDrag, this, &Monitor::slotStartDrag);
      connect(m_glMonitor, SIGNAL(switchFullScreen(bool)), this, \
                SLOT(slotSwitchFullScreen(bool)));
 -    connect(m_glMonitor, SIGNAL(zoomChanged()), this, SLOT(setZoom()));
 +    connect(m_glMonitor, &GLWidget::zoomChanged, this, &Monitor::setZoom);
      connect(m_glMonitor, SIGNAL(lockMonitor(bool)), this, \
                SLOT(slotLockMonitor(bool)), Qt::DirectConnection);
 -    connect(m_glMonitor, SIGNAL(showContextMenu(QPoint)), this, \
SLOT(slotShowMenu(QPoint)));  +    connect(m_glMonitor, &GLWidget::showContextMenu, \
                this, &Monitor::slotShowMenu);
      connect(m_glMonitor, &GLWidget::gpuNotSupported, this, &Monitor::gpuError);
  
      m_glWidget->setMinimumSize(QSize(320, 180));


[prev in list] [next in list] [prev in thread] [next in thread]