Fix compile on KDE < 4.2, based on patch from Mikko Rapeli

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

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 9bb76d83afaaeaeec2593b7ba928e897d2813c6f..197f4d0f53d73107f9acaf30932876c70e396ea5 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -487,7 +487,9 @@ void Monitor::slotExtractCurrentFrame()
     KFileDialog *fs = new KFileDialog(KUrl(), "image/png",this);
     fs->setOperationMode(KFileDialog::Saving);
     fs->setMode(KFile::File);
+#if KDE_IS_VERSION(4,2,0)
     fs->setConfirmOverwrite(true);
+#endif
     fs->setKeepLocation(true);
     fs->exec();
     QString path = fs->selectedFile();

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 02f4a32ffc45b2c9fafdad5148b2e064619a1234..82a20769b7bbbddf1ce8acb5bb9507a4c9b9a7d3 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -30,7 +30,10 @@
 #include <KComboBox>
 #include <KIO/NetAccess>
 #include <KFileItem>
+
+#if KDE_IS_VERSION(4,2,0)
 #include <KDiskFreeSpaceInfo>
+#endif
 
 #include <QMouseEvent>
 #include <QMenu>
@@ -93,13 +96,7 @@ RecMonitor::RecMonitor(QString name, QWidget *parent) :
     m_freeSpace->setMaximumWidth(150);
     QFontMetricsF fontMetrics(font());
     m_freeSpace->setMaximumHeight(fontMetrics.height() * 1.5);
-    KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(KdenliveSettings::capturefolder());
-    if( info.isValid() ) {
-        m_freeSpace->setValue(100 * info.used() / info.size());
-        m_freeSpace->setText(i18n("Free space: %1", KIO::convertSize(info.available())));
-        m_freeSpace->update();
-    }
-
+    updatedFreeSpace();
     layout->addWidget(m_freeSpace);
 #endif
 
@@ -160,12 +157,7 @@ void RecMonitor::slotUpdateCaptureFolder()
     
 #if KDE_IS_VERSION(4,2,0)
     // update free space info
-    KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(KdenliveSettings::capturefolder());
-    if( info.isValid() ) {
-        m_freeSpace->setValue(100 * info.used() / info.size());
-        m_freeSpace->setText(i18n("Free space: %1", KIO::convertSize(info.available())));
-        m_freeSpace->update();
-    }
+    updatedFreeSpace();
 #endif
 }
 
@@ -654,10 +646,24 @@ void RecMonitor::manageCapturedFiles()
 }
 
 // virtual
-void RecMonitor::mousePressEvent(QMouseEvent * /*event*/)
+void RecMonitor::mousePressEvent(QMouseEvent *event)
+{   
+#if KDE_IS_VERSION(4,2,0)
+    if (m_freeSpace->underMouse()) updatedFreeSpace();
+#endif
+}
+
+#if KDE_IS_VERSION(4,2,0)
+void RecMonitor::updatedFreeSpace()
 {
-    slotPlay();
+    KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(KdenliveSettings::capturefolder());
+    if( info.isValid() ) {
+        m_freeSpace->setValue(100 * info.used() / info.size());
+        m_freeSpace->setText(i18n("Free space: %1", KIO::convertSize(info.available())));
+        m_freeSpace->update();
+    }
 }
+#endif
 
 void RecMonitor::activateRecMonitor()
 {

diff --git a/src/recmonitor.h b/src/recmonitor.h
index 2fe343c5a683086a620e21be23a9f6123b9953e4..9c284e79b1d86c2083e36c948cf18158d631625b 100644 (file)
--- a/src/recmonitor.h
+++ b/src/recmonitor.h
@@ -84,6 +84,10 @@ private:
     void checkDeviceAvailability();
     QPixmap mergeSideBySide(const QPixmap& pix, const QString txt);
     void manageCapturedFiles();
+    
+#if KDE_IS_VERSION(4,2,0)
+    void updatedFreeSpace();
+#endif
 
 private slots:
     void slotStartCapture(bool play = true);

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 9d7f3f4866aa6f2909bd63a3819afbc736f65211..998b3212f451d23f994e20324d76f5fa0463693c 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -26,6 +26,7 @@
 #include <KStandardDirs>
 #include <KMessageBox>
 #include <kio/netaccess.h>
+#include <kdeversion.h>
 
 #include <QDomDocument>
 #include <QGraphicsItem>
@@ -1450,7 +1451,9 @@ void TitleWidget::saveTitle(KUrl url)
         KFileDialog *fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle",this);
         fs->setOperationMode(KFileDialog::Saving);
         fs->setMode(KFile::File);
+#if KDE_IS_VERSION(4,2,0)
         fs->setConfirmOverwrite(true);
+#endif
         fs->setKeepLocation(true);
         fs->exec();
         url = fs->selectedUrl();