Fix DBus communication (show rendering progress)

parent e06934c1
...@@ -290,7 +290,7 @@ void RenderJob::initKdenliveDbusInterface() ...@@ -290,7 +290,7 @@ void RenderJob::initKdenliveDbusInterface()
m_dbusargs.clear(); m_dbusargs.clear();
if (kdenliveId.isEmpty()) return; if (kdenliveId.isEmpty()) return;
m_kdenliveinterface = new QDBusInterface(kdenliveId, m_kdenliveinterface = new QDBusInterface(kdenliveId,
QLatin1String("/MainWindow"), QLatin1String("/kdenlive/MainWindow_1"),
QLatin1String("org.kdenlive.MainWindow"), QLatin1String("org.kdenlive.MainWindow"),
connection, connection,
this); this);
......
...@@ -240,6 +240,7 @@ target_link_libraries(kdenlive ...@@ -240,6 +240,7 @@ target_link_libraries(kdenlive
KF5::KIOWidgets KF5::KIOWidgets
KF5::NotifyConfig KF5::NotifyConfig
KF5::NewStuff KF5::NewStuff
KF5::DBusAddons
KF5::XmlGui KF5::XmlGui
#KF5::Service #KF5::Service
#KF5::KIONTLM #KF5::KIONTLM
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <QUrl> //new #include <QUrl> //new
#include <QApplication> #include <QApplication>
#include <KLocalizedString> #include <KLocalizedString>
#include <KDBusService>
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QCommandLineOption> #include <QCommandLineOption>
...@@ -56,11 +57,14 @@ int main(int argc, char *argv[]) ...@@ -56,11 +57,14 @@ int main(int argc, char *argv[])
aboutData.addAuthor(i18n("Jason Wood"), i18n("Original KDE 3 version author (not active anymore)"), "jasonwood@blueyonder.co.uk"); aboutData.addAuthor(i18n("Jason Wood"), i18n("Original KDE 3 version author (not active anymore)"), "jasonwood@blueyonder.co.uk");
aboutData.setTranslator(i18n("NAME OF TRANSLATORS"), i18n("EMAIL OF TRANSLATORS")); aboutData.setTranslator(i18n("NAME OF TRANSLATORS"), i18n("EMAIL OF TRANSLATORS"));
QApplication app(argc, argv);
QCommandLineParser parser; QCommandLineParser parser;
KAboutData::setApplicationData(aboutData); KAboutData::setApplicationData(aboutData);
parser.addVersionOption(); parser.addVersionOption();
parser.addHelpOption(); parser.addHelpOption();
QApplication app(argc, argv);
app.setOrganizationDomain("kde.org");
KDBusService programDBusService;
//PORTING SCRIPT: adapt aboutdata variable if necessary //PORTING SCRIPT: adapt aboutdata variable if necessary
aboutData.setupCommandLine(&parser); aboutData.setupCommandLine(&parser);
parser.process(app); parser.process(app);
......
...@@ -153,12 +153,6 @@ MainWindow::MainWindow(const QString &MltPath, const QUrl &Url, const QString & ...@@ -153,12 +153,6 @@ MainWindow::MainWindow(const QString &MltPath, const QUrl &Url, const QString &
// select current theme // select current theme
QModelIndex index = m_colorschemes->indexForScheme(name); QModelIndex index = m_colorschemes->indexForScheme(name);
m_colorschemes->activateScheme(index); m_colorschemes->activateScheme(index);
// Create DBus interface
new MainWindowAdaptor(this);
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject("/MainWindow", this);
MltConnection::locateMeltAndProfilesPath(MltPath); MltConnection::locateMeltAndProfilesPath(MltPath);
KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile()); KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment