diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e45e59..9c65f50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,49 +1,49 @@ project(spacebar) cmake_minimum_required(VERSION 2.8.12) -set(KF5_MIN_VERSION "5.18.0") +set(KF5_MIN_VERSION "5.61.0") set(QT_MIN_VERSION "5.5.0") ################# Disallow in-source build ################# if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") message(FATAL_ERROR "This application requires an out of source build. Please create a separate build directory.") endif() include(FeatureSummary) ################# set KDE specific information ################# find_package(ECM 0.0.8 REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(ECMSetupVersion) include(ECMGenerateHeaders) include(KDEInstallDirs) include(KDECMakeSettings) include(ECMPoQmTools) include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMPoQmTools) ################# Find dependencies ################# find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Svg QuickControls2 Sql) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 People Service DBusAddons I18n) -find_package (KTp REQUIRED) +find_package(KTp REQUIRED) ################# Enable C++11 features for clang and gcc ################# if(UNIX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x") endif() ################# build and install ################# add_subdirectory(src) install(PROGRAMS org.kde.spacebar.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.kde.spacebar.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) install(FILES org.kde.spacebar.png DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/256x256/apps/) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/contents/ui/NewConversationPage.qml b/src/contents/ui/NewConversationPage.qml index 703c2b0..647023e 100644 --- a/src/contents/ui/NewConversationPage.qml +++ b/src/contents/ui/NewConversationPage.qml @@ -1,64 +1,64 @@ /** * Copyright 2016 Martin Klapetek * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2 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 Library 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. */ import QtQuick 2.3 import QtQuick.Controls 2.4 as Controls import QtQuick.Layouts 1.1 -import org.kde.plasma.private.kpeoplehelper 1.0 +import org.kde.people 1.0 as KPeople import org.kde.kirigami 2.1 as Kirigami import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.telepathy 0.1 Kirigami.ScrollablePage { focus: true title: i18n("Start New Conversation") property string pageName: "newConversationPage" header: Rectangle { clip: true id: header height: toInputField.implicitHeight + 2 * Kirigami.Units.largeSpacing width: root.width color: Kirigami.Theme.backgroundColor Controls.TextField { id: toInputField placeholderText: i18n("Search") anchors.centerIn: parent anchors.margins: Kirigami.Units.largeSpacing width: parent.width - 2 * Kirigami.Units.largeSpacing } } ContactList { anchors.fill: parent id: contactListView requiredProperties: ["phoneNumber", "telepathy-contactUri"] executeDefaultAction: true filterRegExp: toInputField.text - sourceModel: KPeopleHelper { + sourceModel: KPeople.PersonsModel { id: contactsModel } onContactClicked: { root.requestedChannel = personUri; } } }