Cleanup insert/delete track dialog GUI

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

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 2c93814468fb5e0ab2d7eaf05759cb8465fbbcc6..7ac1542f1621a2b71c87604f45b955372786e7aa 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -5179,28 +5179,23 @@ void CustomTrackView::saveThumbnails()
 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);
@@ -5212,16 +5207,14 @@ void CustomTrackView::slotDeleteTrack(int ix)
 {
     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();

diff --git a/src/trackdialog.cpp b/src/trackdialog.cpp
index c62318e8d43e3a9f8108c10329315438986d9bec..7b54943fae40990dad3b712130f7d0b4e4efa27c 100644 (file)
--- a/src/trackdialog.cpp
+++ b/src/trackdialog.cpp
@@ -26,25 +26,16 @@
 
 
 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"
 
 

diff --git a/src/trackdialog.h b/src/trackdialog.h
index 0501b3f87eb149a60d29a9bef3032b10e9e5ff17..317a651f4be7fa2b91685eb1fc895a6964541658 100644 (file)
--- a/src/trackdialog.h
+++ b/src/trackdialog.h
@@ -32,14 +32,6 @@ class TrackDialog : public QDialog, public Ui::AddTrack_UI
 
 public:
     TrackDialog(KdenliveDoc *doc, QWidget * parent = 0);
-    ~TrackDialog();
-
-public slots:
-
-    void slotUpdateName(int);
-
-private:
-    KdenliveDoc *m_doc;
 };
 
 

diff --git a/src/widgets/addtrack_ui.ui b/src/widgets/addtrack_ui.ui
index 46ebad99c9db7533faad2cc048f0ba477fa8f017..1f628f9299c5b497b0cec4a37f0e7ad55d82e09b 100644 (file)
--- a/src/widgets/addtrack_ui.ui
+++ b/src/widgets/addtrack_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>307</width>
-    <height>118</height>
+    <width>257</width>
+    <height>91</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -35,32 +35,6 @@
      </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">
@@ -91,6 +65,9 @@
      </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">
@@ -101,7 +78,7 @@
      </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>
@@ -116,13 +93,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KIntNumInput</class>
-   <extends>QWidget</extends>
-   <header>knuminput.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections>
   <connection>