Commit fc043836 authored by camilo higuita's avatar camilo higuita

Merge branch 'dev-latest-mauikit'

parents e93884f5 bee1c788
...@@ -5,16 +5,25 @@ QT += sql ...@@ -5,16 +5,25 @@ QT += sql
CONFIG += c++17 CONFIG += c++17
QMAKE_LINK += -nostdlib++ QMAKE_LINK += -nostdlib++
#DESTDIR = $$OUT_PWD/../
linux:unix:!android { linux:unix:!android {
} else:android { } else:android {
message(Building helpers for Android) message(Building helpers for Android)
DEFINES += STATIC_KIRIGAMI
#DEFAULT COMPONENTS DEFINITIONS
DEFINES *= \
COMPONENT_EDITOR \
COMPONENT_FM \
COMPONENT_TERMINAL \
COMPONENT_TAGGING \
COMPONENT_SYNCING
DEFINES -= COMPONENT_STORE
include($$PWD/3rdparty/kirigami/kirigami.pri) include($$PWD/3rdparty/kirigami/kirigami.pri)
include($$PWD/3rdparty/mauikit/mauikit.pri) include($$PWD/3rdparty/mauikit/mauikit.pri)
DEFINES += STATIC_KIRIGAMI
} else { } else {
message("Unknown configuration") message("Unknown configuration")
...@@ -55,17 +64,3 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin ...@@ -55,17 +64,3 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target !isEmpty(target.path): INSTALLS += target
include($$PWD/install.pri) include($$PWD/install.pri)
contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
ANDROID_PACKAGE_SOURCE_DIR = \
$$PWD/3rdparty/mauikit/src/android
}
DISTFILES += \
3rdparty/mauikit/src/android/AndroidManifest.xml \
3rdparty/mauikit/src/android/build.gradle \
3rdparty/mauikit/src/android/gradle/wrapper/gradle-wrapper.jar \
3rdparty/mauikit/src/android/gradle/wrapper/gradle-wrapper.properties \
3rdparty/mauikit/src/android/gradlew \
3rdparty/mauikit/src/android/gradlew.bat \
3rdparty/mauikit/src/android/res/values/libs.xml
...@@ -12,7 +12,6 @@ Maui.ApplicationWindow ...@@ -12,7 +12,6 @@ Maui.ApplicationWindow
{ {
id: root id: root
title: browser.currentPath title: browser.currentPath
showAccounts: false
Maui.App.description: qsTr("Index is a file manager that works on desktops, Android and Plasma Mobile. Index lets you browse your system files and applications and preview your music, text, image and video files and share them with external applications.") Maui.App.description: qsTr("Index is a file manager that works on desktops, Android and Plasma Mobile. Index lets you browse your system files and applications and preview your music, text, image and video files and share them with external applications.")
Maui.App.iconName: "qrc:/assets/index.svg" Maui.App.iconName: "qrc:/assets/index.svg"
Maui.App.webPage: "https://mauikit.org" Maui.App.webPage: "https://mauikit.org"
...@@ -44,6 +43,23 @@ Maui.ApplicationWindow ...@@ -44,6 +43,23 @@ Maui.ApplicationWindow
url: browser.currentPath url: browser.currentPath
onHomeClicked: browser.openFolder(Maui.FM.homePath()) onHomeClicked: browser.openFolder(Maui.FM.homePath())
onPlaceClicked: browser.openFolder(path) onPlaceClicked: browser.openFolder(path)
onPlaceRightClicked:
{
_pathBarmenu.path = path
_pathBarmenu.popup()
}
Menu
{
id: _pathBarmenu
property url path
MenuItem
{
text: qsTr("Open in tab")
onTriggered: browser.openTab(_pathBarmenu.path)
}
}
} }
} }
......
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