Revert "Drop support for KDE 4.3."

This reverts commit dce5251b925c314f9d7bf400459bf96b5c1b2c75.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb73bbd6b33376d939fa5177b80fd3998e421799..931ad70478e47286d48e91598cf0c89c3184581b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -292,10 +292,16 @@ include_directories(
 # to the components requested in find_package().
 include(UseQt4)
 
+if(${KDE_VERSION} VERSION_LESS 4.3.80)
+  set(KDE4_KNEWSTUFF_LIBS ${KDE4_KNEWSTUFF2_LIBS})
+else(${KDE_VERSION} VERSION_LESS 4.3.80)
+  set(KDE4_KNEWSTUFF_LIBS ${KDE4_KNEWSTUFF3_LIBS})
+endif(${KDE_VERSION} VERSION_LESS 4.3.80)
+
 target_link_libraries(kdenlive
   ${KDE4_KDEUI_LIBS}
   ${KDE4_KIO_LIBS}
-  ${KDE4_KNEWSTUFF3_LIBS}
+  ${KDE4_KNEWSTUFF_LIBS}
   ${KDE4_KNOTIFYCONFIG_LIBRARY}
   ${KDE4_KROSSUI_LIBS}
   ${QT_LIBRARIES}

diff --git a/src/dvdwizardvob.cpp b/src/dvdwizardvob.cpp
index ebc4b8441340a3d79c8648ae2a4bb941fe37838f..68a2dfa38be5fb3762153d441071b063dc3b7101 100644 (file)
--- a/src/dvdwizardvob.cpp
+++ b/src/dvdwizardvob.cpp
@@ -68,16 +68,22 @@ DvdWizardVob::DvdWizardVob(const QString &profile, QWidget *parent) :
     m_view.vobs_list->header()->setResizeMode(1, QHeaderView::Custom);
     m_view.vobs_list->header()->setResizeMode(2, QHeaderView::Custom);
 
+#if KDE_IS_VERSION(4,2,0)
     m_capacityBar = new KCapacityBar(KCapacityBar::DrawTextInline, this);
     QHBoxLayout *layout = new QHBoxLayout;
     layout->addWidget(m_capacityBar);
     m_view.size_box->setLayout(layout);
+#else
+    m_view.size_box->setHidden(true);
+#endif
     slotCheckVobList();
 }
 
 DvdWizardVob::~DvdWizardVob()
 {
+#if KDE_IS_VERSION(4,2,0)
     delete m_capacityBar;
+#endif
 }
 
 
@@ -294,6 +300,7 @@ void DvdWizardVob::slotCheckVobList()
     if (hasItem && m_view.vobs_list->indexOfTopLevelItem(item) == max - 1) m_view.button_down->setEnabled(false);
     else m_view.button_down->setEnabled(hasItem);
 
+#if KDE_IS_VERSION(4,2,0)
     qint64 totalSize = 0;
     for (int i = 0; i < max; i++) {
         item = m_view.vobs_list->topLevelItem(i);
@@ -303,6 +310,7 @@ void DvdWizardVob::slotCheckVobList()
     qint64 maxSize = (qint64) 47000 * 100000;
     m_capacityBar->setValue(100 * totalSize / maxSize);
     m_capacityBar->setText(KIO::convertSize(totalSize));
+#endif
 }
 
 void DvdWizardVob::slotItemUp()

diff --git a/src/dvdwizardvob.h b/src/dvdwizardvob.h
index aa024dd8d3494c6b14538b8a0473d7006f27ee7a..58698cf0a2018286a5d4b14ecbe1197eed520c8c 100644 (file)
--- a/src/dvdwizardvob.h
+++ b/src/dvdwizardvob.h
@@ -24,7 +24,11 @@
 #include "ui_dvdwizardvob_ui.h"
 
 #include <kdeversion.h>
+
+#if KDE_IS_VERSION(4,2,0)
 #include <kcapacitybar.h>
+#endif
+
 #include <KUrl>
 
 #include <QWizardPage>
@@ -53,7 +57,10 @@ public:
 private:
     Ui::DvdWizardVob_UI m_view;
     QString m_errorMessage;
+
+#if KDE_IS_VERSION(4,2,0)
     KCapacityBar *m_capacityBar;
+#endif
 
 public slots:
     void slotAddVobFile(KUrl url = KUrl(), const QString &chapters = QString());

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 5fe10437fed91dced3dac2b2e34507ddac5b8a08..a81bd553c7c25f183f45fa7c8c09cad1063746ce 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -712,7 +712,9 @@ void KdenliveSettingsDialog::updateSettings()
        KdenliveSettings::setShuttlebuttons(maps);
 #endif
 
+#if KDE_IS_VERSION(4,3,0)
     KConfigDialog::settingsChangedSlot();
+#endif
 
     //KConfigDialog::updateSettings();
     if (resetProfile) emit doResetProfile();
@@ -799,13 +801,17 @@ void KdenliveSettingsDialog::slotShuttleModified()
     QString maps = JogShuttleConfig::actionMap(actions);
     m_shuttleModified = KdenliveSettings::shuttlebuttons() != maps;
 #endif
+#if KDE_IS_VERSION(4,3,0)
     KConfigDialog::updateButtons();
+#endif
 }
 
 void KdenliveSettingsDialog::slotDialogModified()
 {
     m_modified = true;
+#if KDE_IS_VERSION(4,3,0)
     KConfigDialog::updateButtons();
+#endif
 }
 
 //virtual

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f41a7fb1ac1502f819a5bd0457c94869eebd2af3..75ea1445b1cf0f6f7aca6cc8f509b3bdd37c99c8 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -92,8 +92,14 @@
 #include <KFileItem>
 #include <KNotification>
 #include <KNotifyConfigWidget>
+#if KDE_IS_VERSION(4,3,80)
 #include <knewstuff3/downloaddialog.h>
 #include <knewstuff3/knewstuffaction.h>
+#else
+#include <knewstuff2/engine.h>
+#include <knewstuff2/ui/knewstuffaction.h>
+#define KNS3 KNS
+#endif
 #include <KToolBar>
 #include <KColorScheme>
 #include <KProgressDialog>
@@ -229,7 +235,9 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString &
     connect(m_notesWidget, SIGNAL(seekProject(int)), m_projectMonitor->render, SLOT(seekToFrame(int)));
     
     m_notesWidget->setTabChangesFocus(true);
+#if KDE_IS_VERSION(4,4,0)
     m_notesWidget->setClickMessage(i18n("Enter your project notes here ..."));
+#endif
     m_notesDock->setWidget(m_notesWidget);
     addDockWidget(Qt::TopDockWidgetArea, m_notesDock);
 
@@ -3667,6 +3675,7 @@ void MainWindow::slotResizeItemEnd()
 int MainWindow::getNewStuff(const QString &configFile)
 {
     KNS3::Entry::List entries;
+#if KDE_IS_VERSION(4,3,80)
     KNS3::DownloadDialog dialog(configFile);
     dialog.exec();
     entries = dialog.changedEntries();
@@ -3674,6 +3683,15 @@ int MainWindow::getNewStuff(const QString &configFile)
         if (entry.status() == KNS3::Entry::Installed)
             kDebug() << "// Installed files: " << entry.installedFiles();
     }
+#else
+    KNS::Engine engine(0);
+    if (engine.init(configFile))
+        entries = engine.downloadDialogModal(this);
+    foreach(KNS::Entry * entry, entries) {
+        if (entry->status() == KNS::Entry::Installed)
+            kDebug() << "// Installed files: " << entry->installedFiles();
+    }
+#endif
     return entries.size();
 }
 

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 1090112d00ba652867d3109e2004f0d12de4d257..905cad4a4403c14009328b156095eec9352e3204 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -577,7 +577,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 3e7d4323641ce87e9d7eeb719c0584b25c9ab21d..a2b8906ab09d9e24079a1557720f4059a026b0a0 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -36,7 +36,9 @@
 #include <KMessageBox>
 #include <KApplication>
 
+#if KDE_IS_VERSION(4,2,0)
 #include <KDiskFreeSpaceInfo>
+#endif
 
 #include <QMouseEvent>
 #include <QMenu>
@@ -110,6 +112,7 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) :
     m_logger.setFrame(false);
     //m_logger.setInsertPolicy(QComboBox::InsertAtTop);
 
+#if KDE_IS_VERSION(4,2,0)
     m_freeSpace = new KCapacityBar(KCapacityBar::DrawTextInline, this);
     m_freeSpace->setMaximumWidth(150);
     QFontMetricsF fontMetrics(font());
@@ -119,6 +122,7 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) :
     connect(&m_spaceTimer, SIGNAL(timeout()), this, SLOT(slotUpdateFreeSpace()));
     m_spaceTimer.setInterval(30000);
     m_spaceTimer.setSingleShot(false);
+#endif
 
     control_frame_firewire->setLayout(layout);
     m_displayProcess = new QProcess;
@@ -161,7 +165,9 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) :
 
 RecMonitor::~RecMonitor()
 {
+#if KDE_IS_VERSION(4,2,0)
     m_spaceTimer.stop();
+#endif
     delete m_captureProcess;
     delete m_displayProcess;
     if (m_captureDevice) delete m_captureDevice;
@@ -197,8 +203,10 @@ void RecMonitor::slotUpdateCaptureFolder(const QString &currentProjectFolder)
         else KMessageBox::information(this, i18n("You need to stop capture before your changes can be applied"), i18n("Capturing"));
     } else slotVideoDeviceChanged(device_selector->currentIndex());
 
+#if KDE_IS_VERSION(4,2,0)
     // update free space info
     slotUpdateFreeSpace();
+#endif
 }
 
 void RecMonitor::slotVideoDeviceChanged(int ix)
@@ -531,7 +539,9 @@ void RecMonitor::slotRecord()
         m_isCapturing = true;
         m_didCapture = true;
         m_captureProcess->write("c\n", 3);
+#if KDE_IS_VERSION(4,2,0)
         m_spaceTimer.start();
+#endif
         return;
     }
     if (m_captureProcess->state() == QProcess::NotRunning) {
@@ -782,9 +792,12 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status)
         }
         m_isCapturing = false;
 
+#if KDE_IS_VERSION(4,2,0)
         m_spaceTimer.stop();
         // update free space info
         slotUpdateFreeSpace();
+#endif
+
     } else {
         if (device_selector->currentIndex() != SCREENGRAB) m_stopAction->setEnabled(true);
         device_selector->setEnabled(false);
@@ -847,17 +860,21 @@ void RecMonitor::manageCapturedFiles()
 // virtual
 void RecMonitor::mousePressEvent(QMouseEvent * /*event*/)
 {
+#if KDE_IS_VERSION(4,2,0)
     if (m_freeSpace->underMouse()) slotUpdateFreeSpace();
+#endif
 }
 
 void RecMonitor::slotUpdateFreeSpace()
 {
+#if KDE_IS_VERSION(4,2,0)
     KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(m_capturePath);
     if (info.isValid() && info.size() > 0) {
         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::refreshRecMonitor(bool visible)

diff --git a/src/recmonitor.h b/src/recmonitor.h
index ec25a73c556d681beb9aa871d596ee447a0eb5dd..fe1d90fb2fb0bd3611ebcc83fcabbf232ae7b574 100644 (file)
--- a/src/recmonitor.h
+++ b/src/recmonitor.h
@@ -41,7 +41,9 @@
 #include <kdeversion.h>
 #include <KComboBox>
 
+#if KDE_IS_VERSION(4,2,0)
 #include <kcapacitybar.h>
+#endif
 
 class MonitorManager;
 class MltDeviceCapture;
@@ -74,8 +76,10 @@ private:
     KComboBox m_logger;
     QString m_capturePath;
 
+#if KDE_IS_VERSION(4,2,0)
     KCapacityBar *m_freeSpace;
     QTimer m_spaceTimer;
+#endif
 
     KUrl m_captureFile;
     KIcon m_playIcon;

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 5a00bd44077f27038df4f335e848c44fc9fc666a..0e98ceeb08d63cb7db5cf0c9e93324d2dc11aedb 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -1800,7 +1800,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();