Fix several problems with clip crop start, fix undo transition deletion, set monitor...

[kdenlive] / src / projectlist.cpp

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 51429e4446e58194f702bd3c6bb326b19abc537d..899b41f3dcae9acf1e15b103b5b1c26493f77784 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -71,16 +71,16 @@ ProjectList::ProjectList(QWidget *parent)
     addButton->setPopupMode(QToolButton::MenuButtonPopup);
     m_toolbar->addWidget(addButton);
 
-    QAction *addClipButton = addMenu->addAction(KIcon("document-new"), i18n("Add Clip"));
+    QAction *addClipButton = addMenu->addAction(KIcon("kdenlive-add-clip"), i18n("Add Clip"));
     connect(addClipButton, SIGNAL(triggered()), this, SLOT(slotAddClip()));
 
-    QAction *addColorClip = addMenu->addAction(KIcon("document-new"), i18n("Add Color Clip"));
+    QAction *addColorClip = addMenu->addAction(KIcon("kdenlive-add-color-clip"), i18n("Add Color Clip"));
     connect(addColorClip, SIGNAL(triggered()), this, SLOT(slotAddColorClip()));
 
-    QAction *addSlideClip = addMenu->addAction(KIcon("document-new"), i18n("Add Slideshow Clip"));
+    QAction *addSlideClip = addMenu->addAction(KIcon("kdenlive-add-slide-clip"), i18n("Add Slideshow Clip"));
     connect(addSlideClip, SIGNAL(triggered()), this, SLOT(slotAddSlideshowClip()));
 
-    QAction *addTitleClip = addMenu->addAction(KIcon("document-new"), i18n("Add Title Clip"));
+    QAction *addTitleClip = addMenu->addAction(KIcon("kdenlive-add-text-clip"), i18n("Add Title Clip"));
     connect(addTitleClip, SIGNAL(triggered()), this, SLOT(slotAddTitleClip()));
 
     m_deleteAction = m_toolbar->addAction(KIcon("edit-delete"), i18n("Delete Clip"));
@@ -104,6 +104,7 @@ ProjectList::ProjectList(QWidget *parent)
     m_menu = new QMenu();
     m_menu->addAction(addClipButton);
     m_menu->addAction(addColorClip);
+    m_menu->addAction(addSlideClip);
     m_menu->addAction(addTitleClip);
     m_menu->addAction(m_editAction);
     m_menu->addAction(m_deleteAction);
@@ -129,7 +130,7 @@ ProjectList::~ProjectList() {
 
 void ProjectList::slotEditClip() {
     ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
-    if (item && !item->isGroup()) emit clipSelected(item->toXml());
+    if (item && !item->isGroup()) emit clipSelected(item->referencedClip());
     emit showClipProperties(item->referencedClip());
 }
 
@@ -144,11 +145,11 @@ void ProjectList::slotClipSelected() {
     if (item && !item->isGroup()) {
         if (item == m_selectedItem) {
             // if user clicked on the active clip item, just focus monitor, don't update it.
-            emit clipSelected(QDomElement());
+            emit clipSelected(NULL);
             return;
         }
         m_selectedItem = item;
-        emit clipSelected(item->toXml());
+        emit clipSelected(item->referencedClip());
     }
 }
 
@@ -310,7 +311,7 @@ void ProjectList::slotAddClip(QUrl givenUrl, QString group) {
     if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!!  NO CMD STK";
     KUrl::List list;
     if (givenUrl.isEmpty())
-        list = KFileDialog::getOpenUrls(KUrl(), "application/vnd.kde.kdenlive application/vnd.westley.scenelist application/flv application/vnd.rn-realmedia video/x-dv video/x-msvideo video/mpeg video/x-ms-wmv audio/mpeg audio/x-mp3 audio/x-wav application/ogg *.m2t *.dv video/mp4 video/quicktime image/gif image/jpeg image/png image/x-bmp image/svg+xml image/tiff image/x-xcf-gimp image/x-vnd.adobe.photoshop image/x-pcx image/x-exr");
+        list = KFileDialog::getOpenUrls(KUrl(), "application/vnd.kde.kdenlive application/vnd.westley.scenelist application/flv application/vnd.rn-realmedia video/x-dv video/x-msvideo video/mpeg video/x-ms-wmv audio/mpeg audio/x-mp3 audio/x-wav application/ogg *.m2t *.mts *.dv video/mp4 video/quicktime image/gif image/jpeg image/png image/x-bmp image/svg+xml image/tiff image/x-xcf-gimp image/x-vnd.adobe.photoshop image/x-pcx image/x-exr");
     else list.append(givenUrl);
     if (list.isEmpty()) return;
     KUrl::List::Iterator it;
@@ -444,10 +445,9 @@ void ProjectList::slotRefreshClipThumbnail(int clipId) {
 
 void ProjectList::slotRefreshClipThumbnail(ProjectItem *item) {
     if (item) {
-        int height = 40;
-        int width = (int)(height  * (double) m_render->renderWidth() / m_render->renderHeight());
-        QPixmap pix = KThumb::getImage(item->toXml(), item->referencedClip()->getProjectThumbFrame(), width, height);
-        //QPixmap pix = KThumb::getFrame(item->toXml()), 0, width, height);
+        int height = 50;
+        int width = (int)(height  * m_render->dar());
+        QPixmap pix = KThumb::getImage(item->toXml(), item->referencedClip()->getClipThumbFrame(), width, height);
         item->setIcon(0, pix);
     }
 }