[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=dcf4ced

The following commit has been merged in the master branch:
commit dcf4cedd81ae22b16a51cde9c9821f293ae71b4b
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Thu Aug 18 23:10:46 2011 +0200

    Plasmoid should now install files in correct places
    
    the declarative part was not detected before
---
 CMakeLists.txt                                    |   1 +
 src/{ => declarative/contents}/frames/away.png    | Bin
 src/{ => declarative/contents}/frames/busy.png    | Bin
 src/{ => declarative/contents}/frames/offline.png | Bin
 src/{ => declarative/contents}/frames/online.png  | Bin
 src/declarative/{ => contents/ui}/Avatar.qml      |   0
 src/declarative/{ => contents/ui}/Contact.qml     |   0
 src/declarative/{ => contents/ui}/main.qml        |   0
 src/telepathyContact.cpp                          |  11 +++++++++--
 9 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ada8155..85e4e4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,5 +45,6 @@ kde4_add_ui_files(telepathy_contact_applet_SRCS
 kde4_add_plugin(plasma_applet_telepathy_contact ${telepathy_contact_applet_SRCS})
 target_link_libraries(plasma_applet_telepathy_contact ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${TELEPATHY_QT4_LIBRARIES})
 
+install(DIRECTORY src/declarative/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.telepathy-contact)
 install(TARGETS plasma_applet_telepathy_contact DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES telepathy-contact-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
\ No newline at end of file
diff --git a/src/frames/away.png b/src/declarative/contents/frames/away.png
similarity index 100%
rename from src/frames/away.png
rename to src/declarative/contents/frames/away.png
diff --git a/src/frames/busy.png b/src/declarative/contents/frames/busy.png
similarity index 100%
rename from src/frames/busy.png
rename to src/declarative/contents/frames/busy.png
diff --git a/src/frames/offline.png b/src/declarative/contents/frames/offline.png
similarity index 100%
rename from src/frames/offline.png
rename to src/declarative/contents/frames/offline.png
diff --git a/src/frames/online.png b/src/declarative/contents/frames/online.png
similarity index 100%
rename from src/frames/online.png
rename to src/declarative/contents/frames/online.png
diff --git a/src/declarative/Avatar.qml b/src/declarative/contents/ui/Avatar.qml
similarity index 100%
rename from src/declarative/Avatar.qml
rename to src/declarative/contents/ui/Avatar.qml
diff --git a/src/declarative/Contact.qml b/src/declarative/contents/ui/Contact.qml
similarity index 100%
rename from src/declarative/Contact.qml
rename to src/declarative/contents/ui/Contact.qml
diff --git a/src/declarative/main.qml b/src/declarative/contents/ui/main.qml
similarity index 100%
rename from src/declarative/main.qml
rename to src/declarative/contents/ui/main.qml
diff --git a/src/telepathyContact.cpp b/src/telepathyContact.cpp
index 84e6c9f..ae87456 100644
--- a/src/telepathyContact.cpp
+++ b/src/telepathyContact.cpp
@@ -20,14 +20,19 @@
 #include "config.h"
 #include "telepathyContact.h"
 
+#include <KStandardDirs>
+
+#include <Plasma/PackageStructure>
+
 #include <QtGui/QPainter>
 
+
 TelepathyContact::TelepathyContact(QObject* parent, const QVariantList& args)
     : Plasma::Applet(parent, args)
     , m_config(new Config())
     , m_declarative(new Plasma::DeclarativeWidget(this))
 {
-    setBackgroundHints(NoBackground);
+    setBackgroundHints(DefaultBackground);
     m_declarative->setGeometry(geometry());
 
     // user shouldn't be able to resize the plasmoid
@@ -45,7 +50,9 @@ void TelepathyContact::init()
     Plasma::Applet::init();
 
     if (m_declarative) {
-        m_declarative->setQmlPath("../src/declarative/main.qml");
+        QString qmlFile = KGlobal::dirs()->findResource("data", "plasma/plasmoids/org.kde.telepathy-contact/contents/ui/main.qml");
+        qDebug() << "LOADING: " << qmlFile;
+        m_declarative->setQmlPath(qmlFile);
     }
 }
 

-- 
ktp-contact-applet packaging