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

List:       kde-commits
Subject:    [kdenlive/Applications/16.08] src: Fix "use timeline zone for insert" shortcut
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-08-31 21:24:08
Message-ID: E1bfCzQ-00039P-I9 () code ! kde ! org
[Download RAW message or body]

Git commit 0bcb269ce22deff282b06698a48001f2f0f975fc by Jean-Baptiste Mardelle.
Committed on 31/08/2016 at 21:23.
Pushed by mardelle into branch 'Applications/16.08'.

Fix "use timeline zone for insert" shortcut
CCBUG: 368059

M  +2    -1    src/doc/kdenlivedoc.cpp
M  +6    -0    src/mainwindow.cpp
M  +2    -5    src/timeline/timeline.cpp

http://commits.kde.org/kdenlive/0bcb269ce22deff282b06698a48001f2f0f975fc

diff --git a/src/doc/kdenlivedoc.cpp b/src/doc/kdenlivedoc.cpp
index f4dd8c8..cbd5c2d 100644
--- a/src/doc/kdenlivedoc.cpp
+++ b/src/doc/kdenlivedoc.cpp
@@ -1545,7 +1545,8 @@ void KdenliveDoc::getFileProperties(const QDomElement &xml, \
const QString &clipI  void KdenliveDoc::doAddAction(const QString &name, QAction *a, \
QKeySequence shortcut)  {
     pCore->window()->actionCollection()->addAction(name, a);
-    pCore->window()->actionCollection()->setDefaultShortcut(a, shortcut);
+    a->setShortcut(shortcut);
+    pCore->window()->actionCollection()->setDefaultShortcut(a, a->shortcut());
 }
 
 QAction *KdenliveDoc::getAction(const QString &name)
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4828343..1fcc076 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -955,6 +955,12 @@ void MainWindow::setupActions()
     connect(sceneMode, SIGNAL(triggered(QAction*)), this, \
SLOT(slotChangeEdit(QAction*)));  addAction(QStringLiteral("timeline_mode"), \
sceneMode);  
+    KDualAction *ac = new KDualAction(i18n("Don't Use Timeline Zone for Insert"), \
i18n("Use Timeline Zone for Insert"), this); +    \
ac->setActiveIcon(KoIconUtils::themedIcon(QStringLiteral("timeline-use-zone-on"))); + \
ac->setInactiveIcon(KoIconUtils::themedIcon(QStringLiteral("timeline-use-zone-off")));
 +    ac->setShortcut(Qt::Key_G);
+    addAction(QStringLiteral("use_timeline_zone_in_edit"), ac);
+
     m_compositeAction = new \
KSelectAction(KoIconUtils::themedIcon("composite-track-off"), i18n("Track \
compositing"), this);  m_compositeAction->setToolTip(i18n("Track compositing"));
     QAction *noComposite = new \
                QAction(KoIconUtils::themedIcon("composite-track-off"),
diff --git a/src/timeline/timeline.cpp b/src/timeline/timeline.cpp
index a076c91..225c436 100644
--- a/src/timeline/timeline.cpp
+++ b/src/timeline/timeline.cpp
@@ -130,15 +130,12 @@ Timeline::Timeline(KdenliveDoc *doc, const QList<QAction *> \
&actions, const QLis  sizeLayout->addWidget(butLarge);
 
     QToolButton *enableZone = new QToolButton(this);
-    KDualAction *ac = new KDualAction(i18n("Don't Use Timeline Zone for Insert"), \
                i18n("Use Timeline Zone for Insert"), this);
-    ac->setActiveIcon(KoIconUtils::themedIcon(QStringLiteral("timeline-use-zone-on")));
                
-    ac->setInactiveIcon(KoIconUtils::themedIcon(QStringLiteral("timeline-use-zone-off")));
 +    KDualAction *ac = (KDualAction*) \
m_doc->getAction(QStringLiteral("use_timeline_zone_in_edit"));  \
enableZone->setAutoRaise(true);  \
ac->setActive(KdenliveSettings::useTimelineZoneToEdit());  \
                enableZone->setDefaultAction(ac);
     connect(ac, &KDualAction::activeChangedByUser, this, &Timeline::slotEnableZone);
     sizeLayout->addWidget(enableZone);
-    m_doc->doAddAction(QStringLiteral("use_timeline_zone_in_edit"), ac, Qt::Key_G);
 
     QHBoxLayout *tracksLayout = new QHBoxLayout;
     tracksLayout->setContentsMargins(0, 0, 0, 0);
@@ -168,7 +165,7 @@ Timeline::Timeline(KdenliveDoc *doc, const QList<QAction *> \
                &actions, const QLis
     connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, \
                SLOT(slotMoveRuler(int)));
     connect(m_trackview->horizontalScrollBar(), SIGNAL(rangeChanged(int,int)), this, \
                SLOT(slotUpdateVerticalScroll(int,int)));
     connect(m_trackview, SIGNAL(mousePosition(int)), this, \
                SIGNAL(mousePosition(int)));
-    m_disablePreview = m_doc->getAction("disable_preview");
+    m_disablePreview = m_doc->getAction(QStringLiteral("disable_preview"));
     connect(m_disablePreview, &QAction::triggered, this, &Timeline::disablePreview);
     m_disablePreview->setEnabled(false);
     m_trackview->initTools();


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