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

List:       kde-commits
Subject:    [kdenlive/Applications/16.08] src/bin: Make "Clip Properties" open title / slideshow widget
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-07-27 21:03:51
Message-ID: E1bSVzb-0001YE-H7 () code ! kde ! org
[Download RAW message or body]

Git commit 7814f9ff8a21244315b3ff62b53c876b80d62980 by Jean-Baptiste Mardelle.
Committed on 27/07/2016 at 21:03.
Pushed by mardelle into branch 'Applications/16.08'.

Make "Clip Properties" open title / slideshow widget

M  +17   -15   src/bin/bin.cpp

http://commits.kde.org/kdenlive/7814f9ff8a21244315b3ff62b53c876b80d62980

diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp
index 6c53d6b..01a8a61 100644
--- a/src/bin/bin.cpp
+++ b/src/bin/bin.cpp
@@ -1634,15 +1634,7 @@ void Bin::slotItemDoubleClicked(const QModelIndex &ix, const \
QPoint pos)  if (item->itemType() == AbstractProjectItem::ClipItem) {
             ProjectClip *clip = static_cast<ProjectClip*>(item);
             if (clip) {
-                if (clip->clipType() == Text) {
-                    showTitleWidget(clip);
-                } else if (clip->clipType() == SlideShow) {
-                    showSlideshowWidget(clip);
-                } else if (clip->clipType() == QText) {
-                    ClipCreationDialog::createQTextClip(m_doc, getFolderInfo(), \
                this, clip);
-                } else {
-                    slotSwitchClipProperties(ix);
-                }
+                slotSwitchClipProperties(ix);
             }
         }
     }
@@ -1685,16 +1677,26 @@ void Bin::slotSwitchClipProperties(const QModelIndex &ix)
         // User clicked in the icon, open clip properties
         AbstractProjectItem *item = \
static_cast<AbstractProjectItem*>(m_proxyModel->mapToSource(ix).internalPointer());  \
                ProjectClip *clip = qobject_cast<ProjectClip*>(item);
-        m_propertiesPanel->setEnabled(true);
-        showClipProperties(clip);
-    }
-    else {
+        if (clip->clipType() == Text) {
+            m_propertiesPanel->setEnabled(false);
+            showTitleWidget(clip);
+        } else if (clip->clipType() == SlideShow) {
+            m_propertiesPanel->setEnabled(false);
+            showSlideshowWidget(clip);
+        } else if (clip->clipType() == QText) {
+            m_propertiesPanel->setEnabled(false);
+            ClipCreationDialog::createQTextClip(m_doc, getFolderInfo(), this, clip);
+        } else {
+            m_propertiesPanel->setEnabled(true);
+            showClipProperties(clip);
+            m_propertiesDock->show();
+            m_propertiesDock->raise();
+        }
+    } else {
         m_propertiesPanel->setEnabled(false);
     }
     // Check if properties panel is not tabbed under Bin
     //if (!pCore->window()->isTabbedWith(m_propertiesDock, \
                QStringLiteral("project_bin"))) {
-    m_propertiesDock->show();
-    m_propertiesDock->raise();
 }
 
 void Bin::doRefreshPanel(const QString &id)


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