Also show icons in track selection for transitions

svn path=/trunk/kdenlive/; revision=4558

diff --git a/src/trackdialog.cpp b/src/trackdialog.cpp
index 966362eb74ba3667cb4407bfb1c45b65c83402cf..0f4ffc01dfa40fbf0cd2f207872b86c7fd20242a 100644 (file)
--- a/src/trackdialog.cpp
+++ b/src/trackdialog.cpp
@@ -36,7 +36,7 @@ TrackDialog::TrackDialog(KdenliveDoc *doc, QWidget * parent) :
     for (int i = 0; i < doc->tracksCount(); ++i) {
         TrackInfo info = doc->trackInfoAt(doc->tracksCount() - i - 1);
         comboTracks->addItem(info.type == VIDEOTRACK ? videoIcon : audioIcon,
-                             info.trackName.isEmpty() ? QString::number(i) : QString::number(i) + ": " + info.trackName);
+                             info.trackName.isEmpty() ? QString::number(i) : info.trackName + " (" + QString::number(i) + ")");
     }
 }
 

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index 8d7e014af5656e7ed36762474708dad539905591..55df15538170bf8ef14f6897f51736bd2fdf9002 100644 (file)
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -84,13 +84,16 @@ void TransitionSettings::updateTrackList()
     transitionTrack->clear();
     transitionTrack->addItem(i18n("Auto"), -1);
     int limit = 1;
-    if (m_usedTransition) limit = m_usedTransition->track() + 1;
+    if (m_usedTransition)
+        limit = m_usedTransition->track() + 1;
     kDebug() << "/ / TRANS TRK: " << limit;
+    KIcon videoIcon("kdenlive-show-video");
+    KIcon audioIcon("kdenlive-show-audio");
     for (int i = limit; i < m_tracks.count(); i++) {
         int ix = m_tracks.count() - i - 1;
-        if (!m_tracks.at(ix).trackName.isEmpty())
-            transitionTrack->addItem(m_tracks.at(ix).trackName + '(' + QString::number(i) + ')', m_tracks.count() - i);
-        else transitionTrack->addItem(QString::number(i), m_tracks.count() - i);
+        transitionTrack->addItem(m_tracks.at(ix).type == VIDEOTRACK ? videoIcon : audioIcon,
+                                 m_tracks.at(ix).trackName.isEmpty() ? QString::number(i) : m_tracks.at(ix).trackName + " (" + QString::number(i) + ")",
+                                 m_tracks.count() - i);
     }
     transitionTrack->addItem(i18n("Black"), 0);
     transitionTrack->setCurrentIndex(transitionTrack->findData(current));
@@ -164,8 +167,10 @@ void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack
         transitionTrack->blockSignals(true);
         m_usedTransition = t;
         updateTrackList();
-        if (!t->forcedTrack()) transitionTrack->setCurrentIndex(0);
-        else transitionTrack->setCurrentIndex(transitionTrack->findData(t->transitionEndTrack()));
+        if (!t->forcedTrack())
+            transitionTrack->setCurrentIndex(0);
+        else
+            transitionTrack->setCurrentIndex(transitionTrack->findData(t->transitionEndTrack()));
         transitionTrack->blockSignals(false);
         int ix = transitionList->findData(t->transitionInfo(), Qt::UserRole, Qt::MatchExactly);
         if (ix != -1) {
@@ -189,9 +194,8 @@ void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, con
         m_usedTransition->update();
     }
     //oldparam must be also first given to Transition and then return the toXML()
-    if (oldparam != param) {
+    if (oldparam != param)
         emit transitionUpdated(m_usedTransition, oldparam);
-    }
 }
 
 void TransitionSettings::raiseWindow(QWidget* dock)