some more ui work, fit zoom to project

svn path=/branches/KDE4/; revision=2057

diff --git a/src/customruler.cpp b/src/customruler.cpp
index e7bd20e5e4d9093819a5a7e6895b3c16376c32fd..4be4a08703cce520a545a579747b59f457820509 100644 (file)
--- a/src/customruler.cpp
+++ b/src/customruler.cpp
@@ -75,7 +75,7 @@ const int CustomRuler::comboScale[] = { 1, 2, 5, 10, 25, 50, 125, 250, 500, 725,
                                       };
 
 CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent)
-        : KRuler(parent), m_timecode(tc), m_view(parent) {
+        : KRuler(parent), m_timecode(tc), m_view(parent), m_duration(0) {
     slotNewOffset(0);
     setRulerMetricStyle(KRuler::Pixel);
     setLength(1024);
@@ -140,16 +140,27 @@ void CustomRuler::setPixelPerMark(double rate) {
     KRuler::setPixelPerMark(1.0 / scale);
 }
 
+void CustomRuler::setDuration(int d) {
+    m_duration = d;
+    update();
+}
+
 // virtual
 void CustomRuler::paintEvent(QPaintEvent *e) {
     //  debug ("KRuler::drawContents, %s",(horizontal==dir)?"horizontal":"vertical");
 
     QStylePainter p(this);
     p.setClipRect(e->rect());
-    p.fillRect(e->rect(), QBrush(QColor(255, 255, 255, 80)));
+
+    //p.fillRect(e->rect(), QBrush(QColor(200, 200, 200)));
     //kDebug()<<"RULER ZONE: "<<m_zoneStart<<", OFF: "<<offset()<<", END: "<<m_zoneEnd<<", FACTOR: "<<pixelPerMark() * FRAME_SIZE;
-    int zoneStart = (m_zoneStart) * pixelPerMark() * FRAME_SIZE;
-    int zoneEnd = (m_zoneEnd) * pixelPerMark() * FRAME_SIZE;
+    int projectEnd = m_duration * pixelPerMark() * FRAME_SIZE;
+    p.fillRect(QRect(- offset(), e->rect().y(), projectEnd, e->rect().height()), QBrush(QColor(245, 245, 245)));
+
+
+    int zoneStart = m_zoneStart * pixelPerMark() * FRAME_SIZE;
+    int zoneEnd = m_zoneEnd * pixelPerMark() * FRAME_SIZE;
+
     p.fillRect(QRect(zoneStart - offset(), e->rect().y() + e->rect().height() / 2, zoneEnd - zoneStart, e->rect().height() / 2), QBrush(QColor(133, 255, 143)));
 
     int value  = m_view->cursorPos() - offset() + 4;

diff --git a/src/customruler.h b/src/customruler.h
index 0d2e076cd48325ab910fc9cf482c2c2a140ca921..e3570aaf462b6ddaf28fa1d792c9142c5004729d 100644 (file)
--- a/src/customruler.h
+++ b/src/customruler.h
@@ -19,6 +19,7 @@ public:
     static const int comboScale[];
     int outPoint() const;
     int inPoint() const;
+    void setDuration(int d);
 
 protected:
     virtual void paintEvent(QPaintEvent * /*e*/);
@@ -29,6 +30,7 @@ private:
     CustomTrackView *m_view;
     int m_zoneStart;
     int m_zoneEnd;
+    int m_duration;
     RULER_MOVE m_moveCursor;
 
 public slots:

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index e52e4d34471345de66968d42b3f45758f43a6112..961c509345e2159412d71d8f4001ffbcaeb4f377 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -554,6 +554,9 @@ void CustomTrackView::setDuration(int duration) {
     scene()->setSceneRect(0, 0, (m_projectDuration + 500) * m_scale, scene()->sceneRect().height()); //50 * m_tracksCount);
 }
 
+int CustomTrackView::duration() const {
+    return m_projectDuration;
+}
 
 void CustomTrackView::addTrack() {
     m_tracksCount++;

diff --git a/src/customtrackview.h b/src/customtrackview.h
index b3e446a7e6e92ff6a6d9209e44ae24247e933819..ca6e05ceedd1a60bbdc0d0107dd4ded232f2cbc7 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -53,6 +53,7 @@ public:
     void deleteEffect(int track, GenTime pos, QDomElement effect);
     void updateEffect(int track, GenTime pos, QDomElement effect);
     void activateMonitor();
+    int duration() const;
 
 public slots:
     void setCursorPos(int pos, bool seek = true);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index feb61ef41deb881d4e49c228ae2de0c39e235756..107e284c61b4f280d643320c88ae064941050994 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -69,11 +69,16 @@ MainWindow::MainWindow(QWidget *parent)
 
     m_commandStack = new QUndoGroup;
     m_timelineArea = new KTabWidget(this);
-    m_timelineArea->setHoverCloseButton(true);
     m_timelineArea->setTabReorderingEnabled(true);
     m_timelineArea->setTabBarHidden(true);
+
+    QToolButton *closeTabButton = new QToolButton;
+    connect(closeTabButton, SIGNAL(clicked()), this, SLOT(slotRemoveTab()));
+    closeTabButton->setIcon(KIcon("tab-close"));
+    closeTabButton->adjustSize();
+    closeTabButton->setToolTip(i18n("Close the current tab"));
+    m_timelineArea->setCornerWidget(closeTabButton);
     connect(m_timelineArea, SIGNAL(currentChanged(int)), this, SLOT(activateDocument()));
-    connect(m_timelineArea, SIGNAL(closeRequest(QWidget *)), this, SLOT(closeDocument(QWidget *)));
 
 
     initEffects::parseEffectFiles(&m_audioEffects, &m_videoEffects);
@@ -161,6 +166,7 @@ MainWindow::MainWindow(QWidget *parent)
     timeline_buttons_ui.buttonAudio->setDown(KdenliveSettings::audiothumbnails());
     connect(timeline_buttons_ui.buttonVideo, SIGNAL(clicked()), this, SLOT(slotSwitchVideoThumbs()));
     connect(timeline_buttons_ui.buttonAudio, SIGNAL(clicked()), this, SLOT(slotSwitchAudioThumbs()));
+    connect(timeline_buttons_ui.buttonFitZoom, SIGNAL(clicked()), this, SLOT(slotFitZoom()));
 
     statusBar()->insertPermanentWidget(0, statusProgressBar, 1);
     statusBar()->insertPermanentWidget(1, statusLabel, 1);
@@ -169,10 +175,12 @@ MainWindow::MainWindow(QWidget *parent)
     statusBar()->insertPermanentWidget(ID_TIMELINE_FORMAT, m_timecodeFormat);
     statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4);
 
-    timeline_buttons_ui.buttonVideo->setIcon(KIcon("display-video"));
+    timeline_buttons_ui.buttonVideo->setIcon(KIcon("video-mpeg"));
     timeline_buttons_ui.buttonVideo->setToolTip(i18n("Show video thumbnails"));
-    timeline_buttons_ui.buttonAudio->setIcon(KIcon("display-audio"));
+    timeline_buttons_ui.buttonAudio->setIcon(KIcon("audio-mpeg"));
     timeline_buttons_ui.buttonAudio->setToolTip(i18n("Show audio thumbnails"));
+    timeline_buttons_ui.buttonFitZoom->setIcon(KIcon("zoom-fit-best"));
+    timeline_buttons_ui.buttonFitZoom->setToolTip(i18n("Fit zoom to project"));
 
     setupGUI(Default, "kdenliveui.rc");
 
@@ -355,17 +363,16 @@ void MainWindow::activateDocument() {
     connectDocument(currentTab, currentDoc);
 }
 
-void MainWindow::closeDocument(QWidget *w) {
-    if (w == m_timelineArea->currentWidget()) {
-        // closing current document
-        int ix = m_timelineArea->currentIndex() + 1;
-        if (ix == m_timelineArea->count()) ix = 0;
-        m_timelineArea->setCurrentIndex(ix);
-    }
-
+void MainWindow::slotRemoveTab() {
+    QWidget *w = m_timelineArea->currentWidget();
+    // closing current document
+    int ix = m_timelineArea->currentIndex() + 1;
+    if (ix == m_timelineArea->count()) ix = 0;
+    m_timelineArea->setCurrentIndex(ix);
     TrackView *tabToClose = (TrackView *) w;
     KdenliveDoc *docToClose = tabToClose->document();
     m_timelineArea->removeTab(m_timelineArea->indexOf(w));
+    if (m_timelineArea->count() == 1) m_timelineArea->setTabBarHidden(true);
     delete docToClose;
     delete w;
 }
@@ -556,7 +563,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha
         m_activeDocument->backupMltPlaylist();
         if (m_activeTimeline) {
             disconnect(m_projectMonitor, SIGNAL(renderPosition(int)), m_activeTimeline, SLOT(moveCursorPos(int)));
-            disconnect(m_projectMonitor, SIGNAL(durationChanged(int)), m_activeTimeline->projectView(), SLOT(setDuration(int)));
+            disconnect(m_projectMonitor, SIGNAL(durationChanged(int)), m_activeTimeline, SLOT(setDuration(int)));
             disconnect(m_activeDocument, SIGNAL(addProjectClip(DocClipBase *)), m_projectList, SLOT(slotAddClip(DocClipBase *)));
             disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(int)), m_projectList, SLOT(slotDeleteClip(int)));
             disconnect(m_activeDocument, SIGNAL(updateClipDisplay(int)), m_projectList, SLOT(slotUpdateClip(int)));
@@ -581,7 +588,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha
     connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor()));
     connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int)));
     connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int)));
-    connect(m_projectMonitor, SIGNAL(durationChanged(int)), trackView->projectView(), SLOT(setDuration(int)));
+    connect(m_projectMonitor, SIGNAL(durationChanged(int)), trackView, SLOT(setDuration(int)));
     connect(doc, SIGNAL(addProjectClip(DocClipBase *)), m_projectList, SLOT(slotAddClip(DocClipBase *)));
     connect(doc, SIGNAL(signalDeleteProjectClip(int)), m_projectList, SLOT(slotDeleteClip(int)));
     connect(doc, SIGNAL(updateClipDisplay(int)), m_projectList, SLOT(slotUpdateClip(int)));
@@ -609,7 +616,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha
     m_commandStack->setActiveStack(doc->commandStack());
 
     m_overView->setScene(trackView->projectScene());
-    m_overView->scale(m_overView->width() / trackView->duration(), m_overView->height() / (50 * trackView->tracksNumber()));
+    //m_overView->scale(m_overView->width() / trackView->duration(), m_overView->height() / (50 * trackView->tracksNumber()));
     //m_overView->fitInView(m_overView->itemAt(0, 50), Qt::KeepAspectRatio);
 
     setCaption(doc->description());
@@ -670,6 +677,13 @@ void MainWindow::slotZoomOut() {
     timeline_buttons_ui.zoom_slider->setValue(timeline_buttons_ui.zoom_slider->value() + 1);
 }
 
+void MainWindow::slotFitZoom() {
+    TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
+    if (currentTab) {
+        timeline_buttons_ui.zoom_slider->setValue(currentTab->fitZoom());
+    }
+}
+
 void MainWindow::slotGotProgressInfo(KUrl url, int progress) {
     statusProgressBar->setValue(progress);
     if (progress > 0) {

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 536968a689c8a312a7030415f95ef65aad6b708b..7694171051a3332eb320aa0b453912890319a5a4 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -113,7 +113,6 @@ private slots:
     void undo();
     void redo();
     void activateDocument();
-    void closeDocument(QWidget *w);
     void connectDocument(TrackView*, KdenliveDoc*);
     void openFile();
     void saveFile();
@@ -138,6 +137,8 @@ private slots:
     void slotUpdateDocumentState(bool modified);
     void slotZoomIn();
     void slotZoomOut();
+    void slotFitZoom();
+    void slotRemoveTab();
 };
 
 #endif

diff --git a/src/trackview.cpp b/src/trackview.cpp
index c5717a63b94dce88213009c65582f742b2b98501..3607b709912f1cb6d41bca8bd09b965b3dbc73ad 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -30,7 +30,7 @@
 #include "clipitem.h"
 
 TrackView::TrackView(KdenliveDoc *doc, QWidget *parent)
-        : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0), m_projectDuration(0), m_currentZoom(4) {
+        : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0), m_currentZoom(4) {
 
     view = new Ui::TimeLine_UI();
     view->setupUi(this);
@@ -82,7 +82,7 @@ int TrackView::currentZoom() const {
 }
 
 int TrackView::duration() const {
-    return m_projectDuration;
+    return m_trackview->duration();
 }
 
 int TrackView::tracksNumber() const {
@@ -101,6 +101,11 @@ void TrackView::slotClipItemSelected(ClipItem*c) {
     emit clipItemSelected(c);
 }
 
+void TrackView::setDuration(int dur) {
+    m_trackview->setDuration(dur);
+    m_ruler->setDuration(dur);
+}
+
 void TrackView::parseDocument(QDomDocument doc) {
     int cursorPos = 0;
     kDebug() << "//// DOCUMENT: " << doc.toString();
@@ -109,20 +114,20 @@ void TrackView::parseDocument(QDomDocument doc) {
         cursorPos = props.toElement().attribute("timeline_position").toInt();
     }
     QDomNodeList tracks = doc.elementsByTagName("playlist");
-    m_projectDuration = 300;
+    int duration = 300;
     m_projectTracks = tracks.count();
-    int duration = 0;
+    int trackduration = 0;
     kDebug() << "//////////// TIMELINE FOUND: " << m_projectTracks << " tracks";
     for (int i = 0; i < m_projectTracks; i++) {
         if (tracks.item(i).toElement().attribute("hide", QString::null) == "video") {
             // this is an audio track
-            duration = slotAddAudioTrack(i, tracks.item(i).toElement());
+            trackduration = slotAddAudioTrack(i, tracks.item(i).toElement());
         } else if (!tracks.item(i).toElement().attribute("id", QString::null).isEmpty())
-            duration = slotAddVideoTrack(i, tracks.item(i).toElement());
-        kDebug() << " PRO DUR: " << m_projectDuration << ", TRACK DUR: " << duration;
-        if (duration > m_projectDuration) m_projectDuration = duration;
+            trackduration = slotAddVideoTrack(i, tracks.item(i).toElement());
+        kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration;
+        if (trackduration > duration) duration = trackduration;
     }
-    m_trackview->setDuration(m_projectDuration);
+    m_trackview->setDuration(duration);
     //m_trackview->setCursorPos(cursorPos);
     //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height());
 }
@@ -147,6 +152,14 @@ void TrackView::slotChangeZoom(int factor) {
     m_trackview->setScale(m_scale);
 }
 
+int TrackView::fitZoom() const {
+    int zoom = (duration() + 20 / m_scale) * FRAME_SIZE / m_trackview->width();
+    int i;
+    for (i = 0; i < 13; i++)
+        if (m_ruler->comboScale[i] > zoom) break;
+    return i;
+}
+
 const double TrackView::zoomFactor() const {
     return m_scale;
 }

diff --git a/src/trackview.h b/src/trackview.h
index 43c1b5110dc24a341b17e3a93dc808f1618f45f3..ead433f3b9712c33d1af898d0be61cc092abaadd 100644 (file)
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -55,17 +55,18 @@ public:
     int outPoint() const;
     int inPoint() const;
     int currentZoom() const;
+    int fitZoom() const;
 
 public slots:
     void slotDeleteClip(int clipId);
     void slotChangeZoom(int factor);
+    void setDuration(int dur);
 
 private:
     Ui::TimeLine_UI *view;
     CustomRuler *m_ruler;
     CustomTrackView *m_trackview;
     double m_scale;
-    int m_projectDuration;
     int m_projectTracks;
     QString m_editMode;
     QGraphicsScene *m_scene;