X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=9d7d50e588b1c64f02fab1db42de253ce9203608;hb=69774d0fad6b1e7366ec0790849ad70397a56ee9;hp=2e62176abfe454f5d4195db7c3d873c543fb0450;hpb=fd3954b6965b2bc81eeed9fadd40dbbf9607fa37;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index 2e62176a..9d7d50e5 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -39,14 +39,14 @@ #include #include -TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : +TrackView::TrackView(KdenliveDoc *doc, QList actions, bool *ok, QWidget *parent) : QWidget(parent), m_scale(1.0), m_projectTracks(0), m_doc(doc), m_verticalZoom(1) { - + m_trackActions << actions; setupUi(this); // ruler_frame->setMaximumHeight(); // size_frame->setMaximumHeight(); @@ -62,12 +62,14 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : layout->setContentsMargins(m_trackview->frameWidth(), 0, 0, 0); layout->setSpacing(0); ruler_frame->setLayout(layout); + ruler_frame->setMaximumHeight(m_ruler->height()); layout->addWidget(m_ruler); QHBoxLayout *sizeLayout = new QHBoxLayout; sizeLayout->setContentsMargins(0, 0, 0, 0); sizeLayout->setSpacing(0); size_frame->setLayout(sizeLayout); + size_frame->setMaximumHeight(m_ruler->height()); QToolButton *butSmall = new QToolButton(this); butSmall->setIcon(KIcon("kdenlive-zoom-small")); @@ -550,15 +552,13 @@ void TrackView::slotRebuildTrackHeaders() frame->setFixedHeight(1); headers_container->layout()->addWidget(frame); TrackInfo info = list.at(max - i - 1); - header = new HeaderTrack(i, info, height, headers_container); + header = new HeaderTrack(i, info, height, m_trackActions, headers_container); header->setPalette(p); header->setSelectedIndex(m_trackview->selectedTrack()); connect(header, SIGNAL(switchTrackVideo(int)), m_trackview, SLOT(slotSwitchTrackVideo(int))); connect(header, SIGNAL(switchTrackAudio(int)), m_trackview, SLOT(slotSwitchTrackAudio(int))); connect(header, SIGNAL(switchTrackLock(int)), m_trackview, SLOT(slotSwitchTrackLock(int))); connect(header, SIGNAL(selectTrack(int)), m_trackview, SLOT(slotSelectTrack(int))); - connect(header, SIGNAL(deleteTrack(int)), this, SIGNAL(deleteTrack(int))); - connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int))); connect(header, SIGNAL(renameTrack(int, QString)), this, SLOT(slotRenameTrack(int, QString))); connect(header, SIGNAL(configTrack(int)), this, SIGNAL(configTrack(int))); connect(header, SIGNAL(addTrackInfo(const QDomElement, int)), m_trackview, SLOT(slotAddTrackEffect(const QDomElement, int)));