Commit d242bf63 authored by Camilo Higuita's avatar Camilo Higuita

now work with mauikit framework

parent ed7a1351
......@@ -35,9 +35,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef STATIC_KIRIGAMI
#include "./3rdparty/kirigami/src/kirigamiplugin.h"
#include "./mauikit/src/mauikit.h"
#endif
#include "mauikit/src/mauikit.h"
QStringList getFolderImages(const QString &path)
{
......@@ -116,16 +116,13 @@ int main(int argc, char *argv[])
#ifdef STATIC_KIRIGAMI
KirigamiPlugin::getInstance().registerTypes();
MauiKit::getInstance().registerTypes();
#endif
#ifdef Q_OS_ANDROID
QIcon::setThemeName("Luv");
#endif
#ifdef MAUI_APP
MauiKit::getInstance().registerTypes();
#endif
engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
if (engine.rootObjects().isEmpty())
return -1;
......
......@@ -13,19 +13,24 @@ CONFIG += c++11
linux:unix:!android {
message(Building for Linux KDE)
QT += KService KNotifications KNotifications KI18n
QT += KIOCore KIOFileWidgets KIOWidgets KNTLM
LIBS += -lMauiKit
} else:android {
message(Building helpers for Android)
include(android/Android.pri)
include(3rdparty/kirigami/kirigami.pri)
include($$PWD/mauikit/mauikit.pri)
DEFINES += STATIC_KIRIGAMI
} else {
message("Unknown configuration")
}
include($$PWD/mauikit/mauikit.pri)
# The following define makes your compiler emit warnings if you use
# any feature of Qt which as been marked deprecated (the exact warnings
......
......@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "dbactions.h"
#include "fm.h"
#include <MauiKit/fm.h>
DBActions::DBActions(QObject *parent) : DB(parent)
{
......
......@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QObject>
#include "db.h"
#include "tagging.h"
#include <MauiKit/tagging.h>
#include "../utils/pic.h"
class DBActions : public DB
......
......@@ -25,7 +25,7 @@ import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.1
import org.kde.kirigami 2.0 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "widgets"
import "widgets/views/Albums"
......
......@@ -4,7 +4,7 @@ import QtQuick 2.9
import "../widgets/views/Viewer/Viewer.js" as VIEWER
import "../widgets/views/Pix.js" as PIX
import org.kde.kirigami 2.0 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Maui.Page
{
......
......@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
ItemDelegate
{
......
import QtQuick 2.9
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../db/Query.js" as Q
import "../widgets/views/Pix.js" as PIX
import "../view_models"
......
import QtQuick 2.0
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../widgets/views/Viewer/Viewer.js" as VIEWER
......
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Row
{
......
import QtQuick 2.0
import QtQuick.Controls 2.2
import "../../../view_models"
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
ListView
{
......
......@@ -5,7 +5,7 @@ import "../../../view_models"
import "../../../db/Query.js" as Q
import "../../views/Pix.js" as PIX
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
PixDialog
{
......
import QtQuick 2.0
import QtQuick.Controls 2.2
import "../../../view_models"
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
ListView
{
......
......@@ -2,7 +2,7 @@ import QtQuick 2.0
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../../view_models"
import "../../../db/Query.js" as Q
......
......@@ -2,7 +2,7 @@ import QtQuick 2.0
import QtQuick.Controls 2.2
import "../../../view_models"
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Kirigami.PageRow
{
......
......@@ -3,7 +3,7 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import "../../../view_models"
import "../../../db/Query.js" as Q
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Maui.Page
......
import QtQuick 2.9
import "../../../view_models"
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Maui.Page
......
......@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../../view_models"
import "../../../db/Query.js" as Q
......
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Maui.Drawer
{
......
......@@ -7,7 +7,7 @@ import "../../../widgets/views/Pix.js" as PIX
import "../../../db/Query.js" as Q
import "../.."
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Maui.Page
{
......
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