Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 569ee7c5 authored by Linus Jahn's avatar Linus Jahn

Use Material/Green Theme per default

This will need a new dependency: `qtquickcontrols2-5-dev`
(for non-sailfish builds)
parent ac6aea70
......@@ -43,7 +43,7 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
# Find packages
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Qml Quick Sql)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Qml Quick Sql QuickControls2)
find_package(KF5Kirigami2 REQUIRED)
find_package(Swiften REQUIRED)
find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS signals date_time)
......@@ -98,6 +98,7 @@ target_link_libraries(${PROJECT_NAME}
Qt5::Sql
Qt5::Qml
Qt5::Quick
Qt5::QuickControls2
Boost::signals
Boost::date_time
${SWIFTEN_LIBRARY}
......
......@@ -46,7 +46,7 @@ On Linux do the following:
Install dependencies to build Kaidan (for Debian Stretch and Sid)
* `sudo apt-get install apt-transport-https git-core cmake build-essential zlib1g-dev libglib2.0-dev libssl-dev libxml2-dev libcrypto++-dev libpthread-stubs0-dev libidn11-dev libminiupnpc-dev libnatpmp-dev libswiften-dev libboost-system-dev libnotify-bin libboost-program-options-dev libboost-serialization-dev libqt5quick5 libqt5quickcontrols2-5 libqt5quickwidgets5 libqt5qml5 libqt5gui5 libqt5core5a qtdeclarative5-dev qttools5-dev qt5-default qml-module-qtquick-controls2`
* `sudo apt-get install apt-transport-https git-core cmake build-essential zlib1g-dev libglib2.0-dev libssl-dev libxml2-dev libcrypto++-dev libpthread-stubs0-dev libidn11-dev libminiupnpc-dev libnatpmp-dev libswiften-dev libboost-system-dev libnotify-bin libboost-program-options-dev libboost-serialization-dev libqt5quick5 libqt5quickcontrols2-5 libqt5quickwidgets5 libqt5qml5 libqt5gui5 libqt5core5a qtdeclarative5-dev qttools5-dev qt5-default qtquickcontrols2-5-dev qml-module-qtquick-controls2`
Debian currently has no Kirigami2 packages, so we have to install them from external sources.
......
......@@ -142,8 +142,8 @@
<context>
<name>RosterRemoveContactSheet</name>
<message>
<source>Do you really want to delete the contact "%1" from your roster?</source>
<translation>Möchten Sie wirklich "%1" aus Ihrer Kontaktliste entfernen?</translation>
<source>Do you really want to delete the contact &quot;%1&quot; from your roster?</source>
<translation>Möchten Sie wirklich &quot;%1&quot; aus Ihrer Kontaktliste entfernen?</translation>
</message>
<message>
<source>Delete contact</source>
......
......@@ -130,7 +130,7 @@
<context>
<name>RosterRemoveContactSheet</name>
<message>
<source>Do you really want to delete the contact "%1" from your roster?</source>
<source>Do you really want to delete the contact &quot;%1&quot; from your roster?</source>
<translation type="unfinished"></translation>
</message>
<message>
......
......@@ -134,7 +134,7 @@
<context>
<name>RosterRemoveContactSheet</name>
<message>
<source>Do you really want to delete the contact "%1" from your roster?</source>
<source>Do you really want to delete the contact &quot;%1&quot; from your roster?</source>
<translation type="unfinished"></translation>
</message>
<message>
......
......@@ -134,7 +134,7 @@
<context>
<name>RosterRemoveContactSheet</name>
<message>
<source>Do you really want to delete the contact "%1" from your roster?</source>
<source>Do you really want to delete the contact &quot;%1&quot; from your roster?</source>
<translation type="unfinished"></translation>
</message>
<message>
......
......@@ -27,6 +27,7 @@
#include <QLocale>
#include <QQmlApplicationEngine>
#include <QQuickView>
#include <QQuickStyle>
#include <QQmlContext>
#include <QStandardPaths>
#include <QSqlDatabase>
......@@ -172,6 +173,10 @@ int main(int argc, char *argv[])
//
// QML-GUI
//
#ifndef SAILFISH_OS
// QtQuickControls2 Style
QQuickStyle::setStyle("Material");
#endif
QQmlApplicationEngine engine;
engine.rootContext()->setContextProperty("kaidan", &kaidan);
......
......@@ -20,6 +20,7 @@
*/
import QtQuick 2.6
import QtQuick.Controls.Material 2.0
import org.kde.kirigami 2.0 as Kirigami
import io.github.kaidanim 1.0
......@@ -28,6 +29,8 @@ Kirigami.ApplicationWindow {
width: 960
height: 540
Material.accent: Material.Green
// signals
signal addContactDialogRequested()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment