[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/plasma/sreich/sal-qml] plasma/netbook/containments/sal: register on dbus
From:       Shaun Reich <shaun.reich () kdemail ! net>
Date:       2012-04-15 23:15:27
Message-ID: 20120415231527.AEFC1A60BB () git ! kde ! org
[Download RAW message or body]

Git commit 17aca3d5e02d242559b4c8b0cd10d059f62a43e3 by Shaun Reich.
Committed on 11/04/2012 at 03:33.
Pushed by sreich into branch 'plasma/sreich/sal-qml'.

register on dbus

M  +4    -1    plasma/netbook/containments/sal/applet/sallauncher.cpp
M  +1    -0    plasma/netbook/containments/sal/shell/CMakeLists.txt
M  +3    -0    plasma/netbook/containments/sal/shell/fullview.cpp
A  +11   -0    plasma/netbook/containments/sal/shell/salviewer.desktop

http://commits.kde.org/kde-workspace/17aca3d5e02d242559b4c8b0cd10d059f62a43e3

diff --git a/plasma/netbook/containments/sal/applet/sallauncher.cpp \
b/plasma/netbook/containments/sal/applet/sallauncher.cpp index 23f4934..38d68ef \
                100644
--- a/plasma/netbook/containments/sal/applet/sallauncher.cpp
+++ b/plasma/netbook/containments/sal/applet/sallauncher.cpp
@@ -59,7 +59,10 @@ void SalLauncher::init()
 void SalLauncher::iconClicked()
 {
     kDebug() << "ICON CLICKED!";
-//    KToolInvocation::startServiceByDesktopPath
+    QString error;
+    //oddly doesn't work?
+    //KToolInvocation::startServiceByDesktopPath("salviewer.desktop", QStringList(), \
&error); +    //kDebug() << "ERROR?: " << error;
     KRun::runCommand("salviewer", 0);
 }
 
diff --git a/plasma/netbook/containments/sal/shell/CMakeLists.txt \
b/plasma/netbook/containments/sal/shell/CMakeLists.txt index da25f0b..430ecdb 100644
--- a/plasma/netbook/containments/sal/shell/CMakeLists.txt
+++ b/plasma/netbook/containments/sal/shell/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(salviewer ${KDE4_KDEUI_LIBS} \
${KDE4_PLASMA_LIBS})  
 install(TARGETS salviewer ${INSTALL_TARGETS_DEFAULT_ARGS})
 
+install(FILES salviewer.desktop DESTINATION ${SERVICES_INSTALL_DIR})
\ No newline at end of file
diff --git a/plasma/netbook/containments/sal/shell/fullview.cpp \
b/plasma/netbook/containments/sal/shell/fullview.cpp index 47798be..a6a6f22 100644
--- a/plasma/netbook/containments/sal/shell/fullview.cpp
+++ b/plasma/netbook/containments/sal/shell/fullview.cpp
@@ -62,6 +62,9 @@ FullView::FullView(const QString &ff, const QString &loc, bool \
persistent, QWidg  m_persistentConfig(persistent)
 {
     new SalViewerAdaptor(this);
+    QDBusConnection dbus = QDBusConnection::sessionBus();
+    dbus.registerObject("/SalViewer", this);
+    dbus.registerService("org.kde.salViewer");
 
     m_view = new QGraphicsView(this);
     setCentralWidget(m_view);
diff --git a/plasma/netbook/containments/sal/shell/salviewer.desktop \
b/plasma/netbook/containments/sal/shell/salviewer.desktop new file mode 100644
index 0000000..9188cfa
--- /dev/null
+++ b/plasma/netbook/containments/sal/shell/salviewer.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Service
+Icon=kde
+X-KDE-ServiceTypes=
+X-DBUS-StartupType=Unique
+X-KDE-StartupNotify=false
+Exec=salviewer
+
+Name=Search and Launch application
+
+Comment=Displays Search and Launch in a popup


[prev in list] [next in list] [prev in thread] [next in thread]