[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:11:32 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=56eccd8
The following commit has been merged in the master branch:
commit 56eccd87ed88015f64d74733d683524d9d554e12
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date: Sun Aug 21 16:56:17 2011 +0200
Made C++ backend for the plasmoid.
The plasmoid still uses the ktelepathy nepomuk model
---
CMakeLists.txt | 39 ++-
COPYING | 339 +++++++++++++++++++++
cmake/modules/FindTelepathyQt4.cmake | 43 +++
.../contents/ui/ContactDisplayName.qml | 0
.../declarative}/contents/ui/ContactList.qml | 0
.../declarative}/contents/ui/ExternalLabel.qml | 0
.../contents/ui/GridContactDelegate.qml | 0
.../contents/ui/ListContactDelegate.qml | 1 +
.../declarative}/contents/ui/ToolBar.qml | 0
{package => src/declarative}/contents/ui/main.qml | 27 +-
src/telepathyContactList.cpp | 75 +++++
.../ui/ToolBar.qml => src/telepathyContactList.h | 41 ++-
...esktop => telepathy-contact-list-applet.desktop | 21 +-
13 files changed, 544 insertions(+), 42 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae16555..25652b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,42 @@
-project(plasma-applet-presence)
+project(plasma_applet_telepathy_contact_list)
cmake_minimum_required(VERSION 2.8)
-find_package(KDE4 REQUIRED)
+set(CMAKE_MODULE_PATH
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
+ ${CMAKE_MODULE_PATH}
+)
+
+set(KDE_MIN_VERSION "4.7.0")
+
+find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
+find_package(KDE4Workspace REQUIRED)
+find_package(TelepathyQt4 0.7.1 REQUIRED)
include(KDE4Defaults)
-add_definitions(${KDE4_DEFINITIONS})
+add_definitions(${QT_DEFINITIONS}
+ ${KDE4_DEFINITIONS}
+)
-include_directories(
- ${KDE4_INCLUDES}
+include_directories(${CMAKE_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${KDE4_INCLUDES}
+ ${TELEPATHY_QT4_INCLUDE_DIR}
)
-install(DIRECTORY package/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.telepathy-contact-list PATTERN .git EXCLUDE PATTERN CMakeLists.txt EXCLUDE)
+set(telepathy_contact_list_applet_SRCS
+ src/telepathyContactList.cpp
+)
+
+kde4_add_plugin(plasma_applet_telepathy_contact_list ${telepathy_contact_list_applet_SRCS})
+
+target_link_libraries(plasma_applet_telepathy_contact_list
+ ${KDE4_PLASMA_LIBS}
+ ${KDE4_KDEUI_LIBS}
+ ${TELEPATHY_QT4_LIBRARIES}
+ ${QT_QTDECLARATIVE_LIBRARY})
-install(FILES metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME metadata.desktop)
\ No newline at end of file
+install(DIRECTORY src/declarative/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.telepathy-contact-list)
+install(TARGETS plasma_applet_telepathy_contact_list DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES telepathy-contact-list-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/cmake/modules/FindTelepathyQt4.cmake b/cmake/modules/FindTelepathyQt4.cmake
new file mode 100644
index 0000000..c7f8f91
--- /dev/null
+++ b/cmake/modules/FindTelepathyQt4.cmake
@@ -0,0 +1,43 @@
+# Try to find the Qt4 binding of the Telepathy library
+# TELEPATHY_QT4_FOUND - system has TelepathyQt4
+# TELEPATHY_QT4_INCLUDE_DIR - the TelepathyQt4 include directory
+# TELEPATHY_QT4_LIBRARIES - Link these to use TelepathyQt4
+
+# Copyright (c) 2008, Allen Winter <winter at kde.org>
+# Copyright (c) 2009, Andre Moreira Magalhaes <andrunko at gmail.com>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+set(TELEPATHY_QT4_FIND_REQUIRED ${TelepathyQt4_FIND_REQUIRED})
+if(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
+ # Already in cache, be silent
+ set(TELEPATHY_QT4_FIND_QUIETLY TRUE)
+endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
+
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+ if (TelepathyQt4_FIND_VERSION_EXACT)
+ pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4=${TelepathyQt4_FIND_VERSION})
+ else (TelepathyQt4_FIND_VERSION_EXACT)
+ pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=${TelepathyQt4_FIND_VERSION})
+ endif (TelepathyQt4_FIND_VERSION_EXACT)
+endif(PKG_CONFIG_FOUND)
+
+find_path(TELEPATHY_QT4_INCLUDE_DIR
+ NAMES TelepathyQt4/Types
+ HINTS
+ ${PC_TELEPATHY_QT4_INCLUDEDIR}
+ ${PC_TELEPATHY_QT4_INCLUDE_DIRS}
+)
+
+find_library(TELEPATHY_QT4_LIBRARIES
+ NAMES telepathy-qt4
+ HINTS
+ ${PC_TELEPATHY_QT4_LIBDIR}
+ ${PC_TELEPATHY_QT4_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(TELEPATHY_QT4 DEFAULT_MSG
+ TELEPATHY_QT4_LIBRARIES TELEPATHY_QT4_INCLUDE_DIR)
diff --git a/package/contents/ui/ContactDisplayName.qml b/src/declarative/contents/ui/ContactDisplayName.qml
similarity index 100%
rename from package/contents/ui/ContactDisplayName.qml
rename to src/declarative/contents/ui/ContactDisplayName.qml
diff --git a/package/contents/ui/ContactList.qml b/src/declarative/contents/ui/ContactList.qml
similarity index 100%
rename from package/contents/ui/ContactList.qml
rename to src/declarative/contents/ui/ContactList.qml
diff --git a/package/contents/ui/ExternalLabel.qml b/src/declarative/contents/ui/ExternalLabel.qml
similarity index 100%
rename from package/contents/ui/ExternalLabel.qml
rename to src/declarative/contents/ui/ExternalLabel.qml
diff --git a/package/contents/ui/GridContactDelegate.qml b/src/declarative/contents/ui/GridContactDelegate.qml
similarity index 100%
rename from package/contents/ui/GridContactDelegate.qml
rename to src/declarative/contents/ui/GridContactDelegate.qml
diff --git a/package/contents/ui/ListContactDelegate.qml b/src/declarative/contents/ui/ListContactDelegate.qml
similarity index 98%
rename from package/contents/ui/ListContactDelegate.qml
rename to src/declarative/contents/ui/ListContactDelegate.qml
index 1fa5592..e746b71 100644
--- a/package/contents/ui/ListContactDelegate.qml
+++ b/src/declarative/contents/ui/ListContactDelegate.qml
@@ -31,6 +31,7 @@ Item {
Text {
text: delegateDisplayName + delegateAvatar;
+ color: "white"
anchors {
right: parent.right;
}
diff --git a/package/contents/ui/ToolBar.qml b/src/declarative/contents/ui/ToolBar.qml
similarity index 100%
copy from package/contents/ui/ToolBar.qml
copy to src/declarative/contents/ui/ToolBar.qml
diff --git a/package/contents/ui/main.qml b/src/declarative/contents/ui/main.qml
similarity index 84%
rename from package/contents/ui/main.qml
rename to src/declarative/contents/ui/main.qml
index c882138..fdcbab8 100644
--- a/package/contents/ui/main.qml
+++ b/src/declarative/contents/ui/main.qml
@@ -21,9 +21,14 @@ import Qt 4.7
Item {
id: main;
- width: 200;
- height: 400;
- anchors.fill: parent;
+
+ // these settings are made to stay in bounds of the Plasma::DeclarativeWidget
+ x: 10;
+ y:10;
+
+ // plasmoid starting size
+ width: 230;
+ height: 380;
// TODO make plasmoid busy when loading contacts on startup to avoid the user
// complaining about sluggish plasmoid. The "slowness" is caused by nepomuk storing 1000000000000 contacts
@@ -36,6 +41,22 @@ Item {
state: "listView"; // start with list view
}
+ Rectangle {
+ anchors.fill: parent;
+ color: "transparent";
+ border.color: "green"
+ }
+
+ function onWidthChanged()
+ {
+ main.width = TelepathyContactList.width - 20;
+ }
+
+ function onHeightChanged()
+ {
+ main.height = TelepathyContactList.height - 20;
+ }
+
// THIS WILL NOT BE NEEDED.
// // set Label on the left
diff --git a/src/telepathyContactList.cpp b/src/telepathyContactList.cpp
new file mode 100644
index 0000000..3c5b8c7
--- /dev/null
+++ b/src/telepathyContactList.cpp
@@ -0,0 +1,75 @@
+/***************************************************************************
+ * Copyright (C) 2011 by Francesco Nwokeka <francesco.nwokeka at gmail.com> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
+ ***************************************************************************/
+
+#include "telepathyContactList.h"
+
+#include <KStandardDirs>
+
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
+
+TelepathyContactList::TelepathyContactList(QObject* parent, const QVariantList& args)
+ : Applet(parent, args)
+ , m_declarative(new Plasma::DeclarativeWidget(this))
+ , m_qmlObject(0)
+{
+ // set plasmoid size
+ setMinimumSize(250, 400);
+}
+
+TelepathyContactList::~TelepathyContactList()
+{
+ delete m_declarative;
+}
+
+int TelepathyContactList::appletHeight() const
+{
+ return geometry().height();
+}
+
+int TelepathyContactList::appletWidth() const
+{
+ return geometry().width();
+}
+
+void TelepathyContactList::init()
+{
+ // load QML part of the plasmoid
+ if (m_declarative) {
+ QString qmlFile = KGlobal::dirs()->findResource("data", "plasma/plasmoids/org.kde.telepathy-contact-list/contents/ui/main.qml");
+ qDebug() << "LOADING: " << qmlFile;
+ m_declarative->setQmlPath(qmlFile);
+
+ // make C++ Plasma::Applet available to QML for resize signal
+ m_declarative->engine()->rootContext()->setContextProperty("TelepathyContactList", this);
+// m_declarative->engine()->rootContext()->setContextProperty("TelepathyContactListModel", /* model goes here */);
+
+ // setup qml object so that we can talk to the declarative part
+ m_qmlObject = dynamic_cast<QObject*>(m_declarative->rootObject());
+
+ // connect the qml object to recieve signals from C++ end
+ // these two signals are for the plasmoid resize. QML can't determine the Plasma::DeclarativeWidget's boundaries
+ connect(this, SIGNAL(widthChanged()), m_qmlObject, SLOT(onWidthChanged()));
+ connect(this, SIGNAL(heightChanged()), m_qmlObject, SLOT(onHeightChanged()));
+ }
+}
+
+
+// This is the command that links your applet to the .desktop file
+K_EXPORT_PLASMA_APPLET(telepathy-contact-list, TelepathyContactList)
diff --git a/package/contents/ui/ToolBar.qml b/src/telepathyContactList.h
similarity index 67%
rename from package/contents/ui/ToolBar.qml
rename to src/telepathyContactList.h
index e351b7a..42280de 100644
--- a/package/contents/ui/ToolBar.qml
+++ b/src/telepathyContactList.h
@@ -17,31 +17,30 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-import Qt 4.7
-import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
+#ifndef TELEPATHY_CONTACT_LIST_H
+#define TELEPATHY_CONTACT_LIST_H
-Item {
+#include <Plasma/Applet>
+#include <Plasma/DeclarativeWidget>
- PlasmaWidgets.IconWidget {
- id: listViewButton;
+class TelepathyContactList : public Plasma::Applet
+{
+ Q_OBJECT
+public:
+ TelepathyContactList(QObject *parent, const QVariantList &args);
+ virtual ~TelepathyContactList();
- height: 22;
- width: 22;
- icon: QIcon("view-list-details");
+ Q_PROPERTY(int width READ appletWidth);
+ Q_PROPERTY(int height READ appletHeight);
- anchors.left: parent.left;
- }
+ int appletHeight() const; /** returns plasma applet's height */
+ int appletWidth() const; /** returns plasma applet's width */
+ void init();
- PlasmaWidgets.IconWidget {
- id: gridViewButton;
- height: 22;
- width: 22;
- icon: QIcon("view-list-icons");
+private:
+ Plasma::DeclarativeWidget *m_declarative;
+ QObject *m_qmlObject;
+};
- anchors {
- left: listViewButton.right;
- leftMargin: 2;
- }
- }
-}
+#endif // TELEPATHY_CONTACT_LIST_H
diff --git a/package/metadata.desktop b/telepathy-contact-list-applet.desktop
similarity index 51%
rename from package/metadata.desktop
rename to telepathy-contact-list-applet.desktop
index 60abacf..150d505 100644
--- a/package/metadata.desktop
+++ b/telepathy-contact-list-applet.desktop
@@ -1,20 +1,19 @@
[Desktop Entry]
-Name=KDE-Telepathy contact list plasmoid
-Icon=kde-telepathy
+Name=Telepathy Contact List Applet
+Comment=telepathy contact list applet
Type=Service
+ServiceTypes=Plasma/Applet
+Icon=meeting-attending
-X-Plasma-API=declarativeappletscript
-X-Plasma-MainScript=ui/main.qml
-X-Plasma-DefaultSize=200,500
+X-Plasma-DefaultSize=250,300
+X-KDE-Library=plasma_applet_telepathy_contact_list
+X-KDE-PluginInfo-Name=telepathy_contact_list
+X-KDE-PluginInfo-Category=Online Services
X-KDE-PluginInfo-Author=Francesco Nwokeka
X-KDE-PluginInfo-Email=francesco.nwokeka at gmail.com
-X-KDE-PluginInfo-Website=http://telepathy.freedesktop.org/
-X-KDE-PluginInfo-Category=Online Services
-X-KDE-PluginInfo-Name=org.kde.telepathy-contact-list
X-KDE-PluginInfo-Version=0.1
-
+X-KDE-PluginInfo-Website=http://telepathy.freedesktop.org/
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
-X-KDE-ServiceTypes=Plasma/Applet
+X-KDE-PluginInfo-EnabledByDefault=true
\ No newline at end of file
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list