Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[contacts] Move libcontacts-qt5 library into nemo-qml-plugin-contacts…
…. JB#50659 Move the libcontacts-qt5 library into lib/. This package now obsoletes libcontacts-qt5 <= 0.2.11.
- Loading branch information
Bea Lam
committed
Sep 24, 2020
1 parent
97412e4
commit f3db96b
Showing
47 changed files
with
7,322 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
TEMPLATE = subdirs | ||
SUBDIRS = src tools tests translations | ||
SUBDIRS = lib src tools tests translations | ||
|
||
src.depends = lib | ||
tools.depends = src | ||
tests.depends = src | ||
|
||
OTHER_FILES += rpm/nemo-qml-plugin-contacts-qt5.spec |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
/* | ||
* Copyright (c) 2014 - 2020 Jolla Ltd. | ||
* Copyright (c) 2020 Open Mobile Platform LLC. | ||
* | ||
* You may use this file under the terms of the BSD license as follows: | ||
* | ||
* "Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are | ||
* met: | ||
* * Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* * Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in | ||
* the documentation and/or other materials provided with the | ||
* distribution. | ||
* * Neither the name of Nemo Mobile nor the names of its contributors | ||
* may be used to endorse or promote products derived from this | ||
* software without specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." | ||
*/ | ||
|
||
#include "cacheconfiguration.h" | ||
|
||
#include <QtDebug> | ||
|
||
CacheConfiguration::CacheConfiguration() | ||
: m_displayLabelOrder(FirstNameFirst) | ||
, m_sortProperty(QString::fromLatin1("firstName")) | ||
, m_groupProperty(QString::fromLatin1("firstName")) | ||
#ifdef HAS_MLITE | ||
, m_displayLabelOrderConf(QLatin1String("/org/nemomobile/contacts/display_label_order")) | ||
, m_sortPropertyConf(QLatin1String("/org/nemomobile/contacts/sort_property")) | ||
, m_groupPropertyConf(QLatin1String("/org/nemomobile/contacts/group_property")) | ||
#endif | ||
{ | ||
#ifdef HAS_MLITE | ||
connect(&m_displayLabelOrderConf, SIGNAL(valueChanged()), this, SLOT(onDisplayLabelOrderChanged())); | ||
QVariant displayLabelOrder = m_displayLabelOrderConf.value(); | ||
if (displayLabelOrder.isValid()) | ||
m_displayLabelOrder = static_cast<DisplayLabelOrder>(displayLabelOrder.toInt()); | ||
|
||
connect(&m_sortPropertyConf, SIGNAL(valueChanged()), this, SLOT(onSortPropertyChanged())); | ||
QVariant sortPropertyConf = m_sortPropertyConf.value(); | ||
if (sortPropertyConf.isValid()) | ||
m_sortProperty = sortPropertyConf.toString(); | ||
|
||
connect(&m_groupPropertyConf, SIGNAL(valueChanged()), this, SLOT(onGroupPropertyChanged())); | ||
QVariant groupPropertyConf = m_groupPropertyConf.value(); | ||
if (groupPropertyConf.isValid()) | ||
m_groupProperty = groupPropertyConf.toString(); | ||
#endif | ||
} | ||
|
||
#ifdef HAS_MLITE | ||
void CacheConfiguration::onDisplayLabelOrderChanged() | ||
{ | ||
QVariant displayLabelOrder = m_displayLabelOrderConf.value(); | ||
if (displayLabelOrder.isValid() && displayLabelOrder.toInt() != m_displayLabelOrder) { | ||
m_displayLabelOrder = static_cast<DisplayLabelOrder>(displayLabelOrder.toInt()); | ||
emit displayLabelOrderChanged(m_displayLabelOrder); | ||
} | ||
} | ||
|
||
void CacheConfiguration::onSortPropertyChanged() | ||
{ | ||
QVariant sortProperty = m_sortPropertyConf.value(); | ||
if (sortProperty.isValid() && sortProperty.toString() != m_sortProperty) { | ||
const QString newProperty(sortProperty.toString()); | ||
if ((newProperty != QString::fromLatin1("firstName")) && | ||
(newProperty != QString::fromLatin1("lastName"))) { | ||
qWarning() << "Invalid sort property configuration:" << newProperty; | ||
return; | ||
} | ||
|
||
m_sortProperty = newProperty; | ||
emit sortPropertyChanged(m_sortProperty); | ||
} | ||
} | ||
|
||
void CacheConfiguration::onGroupPropertyChanged() | ||
{ | ||
QVariant groupProperty = m_groupPropertyConf.value(); | ||
if (groupProperty.isValid() && groupProperty.toString() != m_groupProperty) { | ||
const QString newProperty(groupProperty.toString()); | ||
if ((newProperty != QString::fromLatin1("firstName")) && | ||
(newProperty != QString::fromLatin1("lastName"))) { | ||
qWarning() << "Invalid group property configuration:" << newProperty; | ||
return; | ||
} | ||
|
||
m_groupProperty = newProperty; | ||
emit groupPropertyChanged(m_groupProperty); | ||
} | ||
} | ||
#endif | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
/* | ||
* Copyright (c) 2014 - 2020 Jolla Ltd. | ||
* Copyright (c) 2020 Open Mobile Platform LLC. | ||
* | ||
* You may use this file under the terms of the BSD license as follows: | ||
* | ||
* "Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are | ||
* met: | ||
* * Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* * Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in | ||
* the documentation and/or other materials provided with the | ||
* distribution. | ||
* * Neither the name of Nemo Mobile nor the names of its contributors | ||
* may be used to endorse or promote products derived from this | ||
* software without specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." | ||
*/ | ||
|
||
#ifndef SEASIDE_CACHE_CONFIGURATION_H | ||
#define SEASIDE_CACHE_CONFIGURATION_H | ||
|
||
#include "contactcacheexport.h" | ||
|
||
#include <QObject> | ||
#include <QString> | ||
|
||
#ifdef HAS_MLITE | ||
#include <mgconfitem.h> | ||
#endif | ||
|
||
class CONTACTCACHE_EXPORT CacheConfiguration : public QObject | ||
{ | ||
Q_OBJECT | ||
|
||
public: | ||
enum DisplayLabelOrder { | ||
FirstNameFirst = 0, | ||
LastNameFirst | ||
}; | ||
|
||
CacheConfiguration(); | ||
|
||
DisplayLabelOrder displayLabelOrder() const { return m_displayLabelOrder; } | ||
QString sortProperty() const { return m_sortProperty; } | ||
QString groupProperty() const { return m_groupProperty; } | ||
|
||
signals: | ||
void displayLabelOrderChanged(CacheConfiguration::DisplayLabelOrder order); | ||
void sortPropertyChanged(const QString &sortProperty); | ||
void groupPropertyChanged(const QString &groupProperty); | ||
|
||
private: | ||
DisplayLabelOrder m_displayLabelOrder; | ||
QString m_sortProperty; | ||
QString m_groupProperty; | ||
|
||
#ifdef HAS_MLITE | ||
MGConfItem m_displayLabelOrderConf; | ||
MGConfItem m_sortPropertyConf; | ||
MGConfItem m_groupPropertyConf; | ||
|
||
private slots: | ||
void onDisplayLabelOrderChanged(); | ||
void onSortPropertyChanged(); | ||
void onGroupPropertyChanged(); | ||
#endif | ||
}; | ||
|
||
#endif // SEASIDE_CACHE_CONFIGURATION_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Copyright (c) 2013 - 2020 Jolla Ltd. | ||
* Copyright (c) 2020 Open Mobile Platform LLC. | ||
* | ||
* You may use this file under the terms of the BSD license as follows: | ||
* | ||
* "Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are | ||
* met: | ||
* * Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* * Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in | ||
* the documentation and/or other materials provided with the | ||
* distribution. | ||
* * Neither the name of Nemo Mobile nor the names of its contributors | ||
* may be used to endorse or promote products derived from this | ||
* software without specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." | ||
*/ | ||
|
||
#ifndef CONTACTCACHEEXPORT_H | ||
#define CONTACTCACHEEXPORT_H | ||
|
||
#include <QtGlobal> | ||
|
||
#ifdef CONTACTCACHE_BUILD | ||
#define CONTACTCACHE_EXPORT Q_DECL_EXPORT | ||
#else | ||
#define CONTACTCACHE_EXPORT Q_DECL_IMPORT | ||
#endif | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
include(../config.pri) | ||
|
||
TEMPLATE = lib | ||
CONFIG += qt hide_symbols | ||
CONFIG += link_pkgconfig create_pc create_prl no_install_prl | ||
|
||
# 'contacts' is too generic for the target name - use 'contactcache' | ||
TARGET = contactcache-qt5 | ||
target.path = $$[QT_INSTALL_LIBS] | ||
INSTALLS += target | ||
|
||
QMAKE_PKGCONFIG_NAME = $$TARGET | ||
QMAKE_PKGCONFIG_DESCRIPTION = Sailfish OS contact cache library | ||
QMAKE_PKGCONFIG_INCDIR = /usr/include/$${TARGET} | ||
QMAKE_PKGCONFIG_LIBDIR = $$target.path | ||
QMAKE_PKGCONFIG_DESTDIR = pkgconfig | ||
QMAKE_PKGCONFIG_REQUIRES = Qt5Core Qt5Contacts Qt5Versit qtcontacts-sqlite-qt5-extensions | ||
QMAKE_PKGCONFIG_VERSION = $$VERSION | ||
|
||
CONFIG += link_pkgconfig | ||
packagesExist(mlite5) { | ||
PKGCONFIG += mlite5 | ||
DEFINES += HAS_MLITE | ||
} else { | ||
warning("mlite not available. Some functionality may not work as expected.") | ||
} | ||
PKGCONFIG += mlocale5 mce qtcontacts-sqlite-qt5-extensions | ||
LIBS += -lphonenumber | ||
|
||
DEFINES += CONTACTCACHE_BUILD | ||
|
||
# We need access to QtContacts private headers | ||
QT += contacts-private | ||
QT -= gui | ||
|
||
# We need the moc output for ContactManagerEngine from sqlite-extensions | ||
extensionsIncludePath = $$system(pkg-config --cflags-only-I qtcontacts-sqlite-qt5-extensions) | ||
VPATH += $$replace(extensionsIncludePath, -I, ) | ||
HEADERS += contactmanagerengine.h | ||
|
||
SOURCES += \ | ||
$$PWD/cacheconfiguration.cpp \ | ||
$$PWD/seasidecache.cpp \ | ||
$$PWD/seasideexport.cpp \ | ||
$$PWD/seasideimport.cpp \ | ||
$$PWD/seasidecontactbuilder.cpp \ | ||
$$PWD/seasidepropertyhandler.cpp | ||
|
||
HEADERS += \ | ||
$$PWD/cacheconfiguration.h \ | ||
$$PWD/contactcacheexport.h \ | ||
$$PWD/seasidecache.h \ | ||
$$PWD/seasideexport.h \ | ||
$$PWD/seasideimport.h \ | ||
$$PWD/seasidecontactbuilder.h \ | ||
$$PWD/synchronizelists.h \ | ||
$$PWD/seasidepropertyhandler.h | ||
|
||
headers.files = \ | ||
$$PWD/cacheconfiguration.h \ | ||
$$PWD/contactcacheexport.h \ | ||
$$PWD/seasidecache.h \ | ||
$$PWD/seasideexport.h \ | ||
$$PWD/seasideimport.h \ | ||
$$PWD/seasidecontactbuilder.h \ | ||
$$PWD/synchronizelists.h \ | ||
$$PWD/seasidepropertyhandler.h | ||
headers.path = /usr/include/$$TARGET | ||
INSTALLS += headers |
Oops, something went wrong.