compile fixes

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

diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
index 909b6a52f941626c71fc2d989bbb72b59c93ee4d..9a642f3867714d312f0ce6e423396c10de685096 100644 (file)
--- a/renderer/renderjob.cpp
+++ b/renderer/renderjob.cpp
@@ -19,12 +19,13 @@
 
 
 #include <QtDBus>
+#include <QFile>
 
 #include "renderjob.h"
 
 static QDBusConnection connection(QLatin1String(""));
 
-RenderJob::RenderJob(bool erase, QString renderer, QString profile, QString rendermodule, QString player, QString scenelist, QString dest, QStringList args, int in, int out) : QObject() {
+RenderJob::RenderJob(bool erase, QString renderer, QString profile, QString rendermodule, QString player, QString scenelist, QString dest, QStringList args, int in, int out) {
     m_scenelist = scenelist;
     m_dest = dest;
     m_player = player;
@@ -47,7 +48,7 @@ RenderJob::~RenderJob() {
 }
 
 void RenderJob::slotAbort() {
-    fprintf(stderr, "Kdenlive-render: JOB ABORTED BY USER...\n");
+    qDebug() << "Kdenlive-render: JOB ABORTED BY USER...";
     m_renderProcess->kill();
     QDBusReply<QString> reply = m_jobUiserver->call("terminate", "");
     if (m_erase) {
@@ -56,7 +57,7 @@ void RenderJob::slotAbort() {
     }
     QFile f(m_dest);
     f.remove();
-    exit(1);
+    qApp->quit();
 }
 
 void RenderJob::receivedStderr() {
@@ -94,12 +95,37 @@ void RenderJob::slotIsOver(int exitcode, QProcess::ExitStatus status) {
         QStringList args;
         args << "--error" << tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest);
         QProcess::startDetached("kdialog", args);
-    } else if (m_player != "-") {
-        QStringList args;
-        args << m_dest;
-        QProcess::startDetached(m_player, args);
+    } else {
+               QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface();
+        if (interface && interface->isServiceRegistered("org.kde.VisualNotifications")) {
+                       QDBusMessage m = QDBusMessage::createMethodCall("org.kde.VisualNotifications",
+                                              "/VisualNotifications",
+                                              "org.kde.VisualNotifications",
+                                              "Notify");
+                       QList<QVariant> args;
+                       uint id = 0;
+                       int timeout = 5;
+                       args.append( QString("kdenlive") ); // app_name
+                       args.append( id ); // replaces_id
+                       args.append( QString("kdenlive") ); // app_icon
+                       args.append( tr("Rendering finished")); // summary
+                       args.append( tr("Rendering of %1 is over").arg(m_dest) ); // body
+                       QStringList actionList;
+                       args.append( actionList ); // actions
+                       args.append( QVariantMap() ); // hints - unused atm
+                       args.append( timeout ); // expire timout
+
+                       m.setArguments( args );
+                       QDBusMessage replyMsg = QDBusConnection::sessionBus().call(m);
+               }
+
+               if (m_player != "-") {
+                       QStringList args;
+                       args << m_dest;
+                       QProcess::startDetached(m_player, args);
+               }
     }
-    exit(1);
+    qApp->quit();
 }
 
 #include "renderjob.moc"

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index faa36337b11e82db0b2ef48721e5771f5913d040..9b0b87273e1bb9fa9348f4bf2981f3d91c25c411 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -689,7 +689,7 @@ void MainWindow::parseProfiles() {
             getUrl->exec();
             KUrl mltPath = getUrl->selectedUrl();
             delete getUrl;
-            if (mltPath.isEmpty()) exit(1);
+            if (mltPath.isEmpty()) kapp->quit();
             KdenliveSettings::setMltpath(mltPath.path());
             QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
         }
@@ -701,7 +701,7 @@ void MainWindow::parseProfiles() {
         getUrl->exec();
         KUrl rendererPath = getUrl->selectedUrl();
         delete getUrl;
-        if (rendererPath.isEmpty()) exit(1);
+        if (rendererPath.isEmpty()) kapp->quit();
         KdenliveSettings::setRendererpath(rendererPath.path());
     }