Various fixes to improve general stability in Qt 4.5.2

[kdenlive] / src / headertrack.cpp

diff --git a/src/headertrack.cpp b/src/headertrack.cpp
index 4a759d742e53e8f843c4d46847935a486b19f096..74be8100bd44053881ee7afc5e19cfe1d16a86af 100644 (file)
--- a/src/headertrack.cpp
+++ b/src/headertrack.cpp
@@ -19,7 +19,6 @@
 
 
 #include "headertrack.h"
-#include "kdenlivesettings.h"
 
 #include <KIcon>
 #include <KLocale>
@@ -29,15 +28,17 @@
 #include <QWidget>
 #include <QPainter>
 #include <QAction>
+#include <QTimer>
 
-HeaderTrack::HeaderTrack(int index, TrackInfo info, QWidget *parent) :
+HeaderTrack::HeaderTrack(int index, TrackInfo info, int height, QWidget *parent) :
         QWidget(parent),
         m_index(index),
         m_type(info.type)
 {
-    setFixedHeight(KdenliveSettings::trackheight());
+    setFixedHeight(height);
     m_view.setupUi(this);
-    m_view.track_number->setText(QString::number(m_index));
+    m_view.track_number->setText(info.trackName.isEmpty() ? QString::number(m_index) : info.trackName);
+
     m_view.buttonVideo->setChecked(!info.isBlind);
     m_view.buttonVideo->setToolTip(i18n("Hide track"));
     m_view.buttonAudio->setChecked(!info.isMute);
@@ -63,24 +64,45 @@ HeaderTrack::HeaderTrack(int index, TrackInfo info, QWidget *parent) :
     connect(m_view.buttonAudio, SIGNAL(clicked()), this, SLOT(switchAudio()));
     connect(m_view.buttonLock, SIGNAL(clicked()), this, SLOT(switchLock()));
 
-    m_contextMenu = new QMenu(this);
+    // Don't show track buttons if size is too small
+    if (height < 40) {
+        m_view.buttonVideo->setHidden(true);
+        m_view.buttonAudio->setHidden(true);
+        m_view.buttonLock->setHidden(true);
+        //m_view.horizontalSpacer;
+    }
 
+    setContextMenuPolicy(Qt::ActionsContextMenu);
     QAction *insertAction = new QAction(i18n("Insert Track"), this);
-    m_contextMenu->addAction(insertAction);
+    addAction(insertAction);
     connect(insertAction, SIGNAL(triggered()), this, SLOT(slotAddTrack()));
 
     QAction *removeAction = new QAction(KIcon("edit-delete"), i18n("Delete Track"), this);
-    m_contextMenu->addAction(removeAction);
+    addAction(removeAction);
     connect(removeAction, SIGNAL(triggered()), this, SLOT(slotDeleteTrack()));
 
     QAction *changeAction = new QAction(i18n("Change Track Type"), this);
-    m_contextMenu->addAction(changeAction);
+    addAction(changeAction);
     connect(changeAction, SIGNAL(triggered()), this, SLOT(slotChangeTrack()));
+
+    QAction *renameAction = new QAction(i18n("Rename Track"), this);
+    addAction(renameAction);
+    connect(renameAction, SIGNAL(triggered()), this, SLOT(slotRenameTrack()));
+
 }
 
 HeaderTrack::~HeaderTrack()
 {
-    delete m_contextMenu;
+}
+
+void HeaderTrack::adjustSize(int height)
+{
+    // Don't show track buttons if size is too small
+    bool smallTracks = height < 40;
+    if (m_type == VIDEOTRACK) m_view.buttonVideo->setHidden(smallTracks);
+    m_view.buttonAudio->setHidden(smallTracks);
+    m_view.buttonLock->setHidden(smallTracks);
+    setFixedHeight(height);
 }
 
 void HeaderTrack::switchVideo()
@@ -121,6 +143,11 @@ void HeaderTrack::setLock(bool lock)
 }
 
 void HeaderTrack::slotDeleteTrack()
+{
+    QTimer::singleShot(500, this, SLOT(deleteTrack()));
+}
+
+void HeaderTrack::deleteTrack()
 {
     emit deleteTrack(m_index);
 }
@@ -135,10 +162,9 @@ void HeaderTrack::slotChangeTrack()
     emit changeTrack(m_index);
 }
 
-// virtual
-void HeaderTrack::contextMenuEvent(QContextMenuEvent * event)
+void HeaderTrack::slotRenameTrack()
 {
-    m_contextMenu->popup(event->globalPos());
+    emit renameTrack(m_index);
 }
 
 // virtual