void CustomTrackView::slotInsertTrack(int ix)
{
TrackDialog d(m_document, parentWidget());
+ d.comboTracks->setCurrentIndex(ix);
d.label->setText(i18n("Insert track"));
- d.track_nb->setMaximum(m_document->tracksCount() - 1);
- d.track_nb->setValue(ix);
d.setWindowTitle(i18n("Insert New Track"));
- d.slotUpdateName(ix);
if (d.exec() == QDialog::Accepted) {
- ix = d.track_nb->value();
- if (d.before_select->currentIndex() == 1) {
+ ix = d.comboTracks->currentIndex();
+ if (d.before_select->currentIndex() == 1)
ix++;
- }
TrackInfo info;
+ info.isMute = false;
+ info.isLocked = false;
if (d.video_track->isChecked()) {
info.type = VIDEOTRACK;
- info.isMute = false;
info.isBlind = false;
- info.isLocked = false;
} else {
info.type = AUDIOTRACK;
- info.isMute = false;
info.isBlind = true;
- info.isLocked = false;
}
AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true);
m_commandStack->push(addTrack);
{
if (m_document->tracksCount() < 2) return;
TrackDialog d(m_document, parentWidget());
+ d.comboTracks->setCurrentIndex(ix);
d.label->setText(i18n("Delete track"));
d.before_select->setHidden(true);
- d.track_nb->setMaximum(m_document->tracksCount() - 1);
- d.track_nb->setValue(ix);
- d.slotUpdateName(ix);
d.setWindowTitle(i18n("Delete Track"));
d.video_track->setHidden(true);
d.audio_track->setHidden(true);
if (d.exec() == QDialog::Accepted) {
- ix = d.track_nb->value();
+ ix = d.comboTracks->currentIndex();
TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
deleteTimelineTrack(ix, info);
setDocumentModified();
TrackDialog::TrackDialog(KdenliveDoc *doc, QWidget * parent) :
- QDialog(parent),
- m_doc(doc)
+ QDialog(parent)
{
//setFont(KGlobalSettings::toolBarFont());
setupUi(this);
- connect(track_nb, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateName(int)));
+ for (int i = 0; i < doc->tracksCount(); ++i) {
+ TrackInfo info = doc->trackInfoAt(doc->tracksCount() - i - 1);
+ comboTracks->addItem(info.trackName.isEmpty() ? QString::number(i) : QString::number(i) + ": " + info.trackName);
+ }
}
-TrackDialog::~TrackDialog()
-{
-}
-
-void TrackDialog::slotUpdateName(int ix)
-{
- ix = m_doc->tracksCount() - ix;
- track_name->setText(m_doc->trackInfoAt(ix - 1).trackName);
-}
-
-
#include "trackdialog.moc"
public:
TrackDialog(KdenliveDoc *doc, QWidget * parent = 0);
- ~TrackDialog();
-
-public slots:
-
- void slotUpdateName(int);
-
-private:
- KdenliveDoc *m_doc;
};
<rect>
<x>0</x>
<y>0</y>
- <width>307</width>
- <height>118</height>
+ <width>257</width>
+ <height>91</height>
</rect>
</property>
<property name="windowTitle">
</item>
</widget>
</item>
- <item row="0" column="3">
- <widget class="KIntNumInput" name="track_nb">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QLabel" name="track_name">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
<item row="1" column="0" colspan="2">
<widget class="QRadioButton" name="video_track">
<property name="text">
</property>
</spacer>
</item>
+ <item row="0" column="3">
+ <widget class="QComboBox" name="comboTracks"/>
+ </item>
<item row="3" column="1" colspan="4">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
</property>
</widget>
</item>
- <item row="1" column="4">
+ <item row="0" column="4" rowspan="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KIntNumInput</class>
- <extends>QWidget</extends>
- <header>knuminput.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections>
<connection>