Fix project list icon aspect ratio, small cleanup

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

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5b2878e7cef485a724b041f0999898e210f24223..bf192efd73c910383e966b85363a15ffa9220e64 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -570,7 +570,7 @@ void MainWindow::slotConnectMonitors() {
     connect(m_projectList, SIGNAL(receivedClipDuration(const QString &, int)), this, SLOT(slotSetClipDuration(const QString &, int)));
     connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *)));
     connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, const QString &)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &)));
-    connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, int, const QPixmap &, int, int)), m_projectList, SLOT(slotReplyGetImage(const QString &, int, const QPixmap &, int, int)));
+    connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &)));
     connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)));
 
     connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &)));

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 9d284d7c94ecc6c259ab159b13f03442a6a97e17..fd29c7660a778c649c1a27d3bfc81e8df380e56e 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -142,6 +142,7 @@ void ProjectList::slotEditClip() {
 
 void ProjectList::setRenderer(Render *projectRender) {
     m_render = projectRender;
+    listView->setIconSize(QSize(40 * m_render->dar(), 40));
 }
 
 void ProjectList::slotClipSelected() {
@@ -685,7 +686,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
     else listView->setEnabled(true);
 }
 
-void ProjectList::slotReplyGetImage(const QString &clipId, int pos, const QPixmap &pix, int w, int h) {
+void ProjectList::slotReplyGetImage(const QString &clipId, const QPixmap &pix) {
     ProjectItem *item = getItemById(clipId);
     if (item) {
         listView->blockSignals(true);

diff --git a/src/projectlist.h b/src/projectlist.h
index d707faf399c4a40db4b2b426f2dc409f60294d3e..1e6c032bf7e226530b7247d4d7adb82ce80621cc 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -118,7 +118,7 @@ public:
 
 public slots:
     void setDocument(KdenliveDoc *doc);
-    void slotReplyGetImage(const QString &clipId, int pos, const QPixmap &pix, int w, int h);
+    void slotReplyGetImage(const QString &clipId, const QPixmap &pix);
     void slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata);
     void slotAddClip(DocClipBase *clip, bool getProperties);
     void slotDeleteClip(const QString &clipId);

diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp
index 4e041938456a754c132e0b7b637a519020802c77..c2aacf800e0b2d8decfcdbc92a320b6cbc49b3f1 100644 (file)
--- a/src/projectlistview.cpp
+++ b/src/projectlistview.cpp
@@ -55,7 +55,6 @@ ProjectListView::ProjectListView(QWidget *parent)
     if (!KdenliveSettings::showdescriptioncolumn()) hideColumn(2);
     if (!KdenliveSettings::showratingcolumn()) hideColumn(3);
 
-    setIconSize(QSize(60, 40));
     setSortingEnabled(true);
 }
 
@@ -239,15 +238,9 @@ void ProjectListView::mouseMoveEvent(QMouseEvent *event) {
             //mimeData->setText(ids.join(";")); //doc.toString());
             //mimeData->setImageData(image);
             drag->setMimeData(mimeData);
-            drag->setPixmap(clickItem->icon(0).pixmap((int)(50 *16 / 9.0), 50));
+            drag->setPixmap(clickItem->icon(0).pixmap(iconSize()));
             drag->setHotSpot(QPoint(0, 50));
-            drag->start(Qt::MoveAction);
-
-            //Qt::DropAction dropAction;
-            //dropAction = drag->start(Qt::CopyAction | Qt::MoveAction);
-
-            //Qt::DropAction dropAction = drag->exec();
-
+            Qt::DropAction dropAction = drag->exec(Qt::MoveAction);
         }
         //event->accept();
     }

diff --git a/src/renderer.cpp b/src/renderer.cpp
index d237cf71d4f84806756e709bc1e6e1d6ac1f3ca7..29ab2f8e8dff0a124c393e811a84ca9d2168f49a 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -598,11 +598,11 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) {
                 pix.fill(Qt::black);
 
             mlt_pool_release(new_image);
-            emit replyGetImage(clipId, 0, pix, width, height);
+            emit replyGetImage(clipId, pix);
 
         } else if (frame->get_int("test_audio") == 0) {
             QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, height));
-            emit replyGetImage(clipId, 0, pixmap, width, height);
+            emit replyGetImage(clipId, pixmap);
             filePropertyMap["type"] = "audio";
         }
     }

diff --git a/src/renderer.h b/src/renderer.h
index 2e28eb643601079aa2c44107576da9dacbf48ded..557de898781a4c859eadfb6a73a138ceae175666 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -239,8 +239,7 @@ signals:   // Signals
     void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &);
 
     /** emitted when the renderer recieves a reply to a getImage request. */
-    void replyGetImage(const QString & , int, const QPixmap &, int, int);
-    void replyGetImage(const QString &, const QPixmap &, int, int);
+    void replyGetImage(const QString &, const QPixmap &);
 
     /** Emitted when the renderer stops, either playing or rendering. */
     void stopped();