Commit f3a25a01 authored by camilo higuita's avatar camilo higuita

fix issue with terminal on kde

parent 2c98de23
QT += androidextras
RESOURCES += \
$$PWD/android.qrc \
$$PWD/../kirigami-icons.qrc \
$$PWD/../app/icons.qrc \
ANDROID_PACKAGE_SOURCE_DIR = $$PWD
......
......@@ -3,4 +3,4 @@
# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
sdk.dir=/opt/android-sdk
sdk.dir=/home/camilo/Android/Sdk
......@@ -17,8 +17,8 @@ linux:unix:!android {
message(Building helpers for Android)
include($$PWD/../android/android.pri)
include($$PWD/../3rdparty/kirigami/kirigami.pri)
DEFINES += STATIC_KIRIGAMI
} else {
......@@ -42,7 +42,6 @@ SOURCES += main.cpp \
RESOURCES += qml.qrc \
assets.qrc \
# Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH =
......
......@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
context->setContextProperty("android", &android);
#else
QStringList importPathList = engine.importPathList();
importPathList.prepend(QCoreApplication::applicationDirPath() + "/qmltermwidget");
importPathList.prepend(QCoreApplication::applicationDirPath() + "/kde/qmltermwidget");
engine.setImportPathList(importPathList);
#endif
......
......@@ -21,7 +21,7 @@ Kirigami.ApplicationWindow
height: Screen.height * (isMobile ? 1 : 0.4)
title: qsTr("Index")
property int sidebarWidth: Kirigami.Units.gridUnit * 14
property int sidebarWidth: Kirigami.Units.gridUnit * (isMobile ? 14 : 11)
pageStack.defaultColumnWidth: sidebarWidth
pageStack.initialPage: [placesSidebar, browser]
......
......@@ -26,7 +26,7 @@ Page
property var previousPath: []
property var nextPath: []
property bool terminalVisible : inx.loadSettings("TERMINAL_VISIBLE", "INX", false) === "true" ? true : false
property bool terminalVisible : inx.loadSettings("TERMINAL_VISIBLE", "BROWSER", false) === "true" ? true : false
property var views : ({
icon : 0,
details : 1,
......@@ -152,6 +152,7 @@ Page
Loader
{
id: terminalLoader
visible: terminalVisible
focus: true
Layout.fillWidth: true
Layout.alignment: Qt.AlignBottom
......@@ -161,8 +162,6 @@ Page
anchors.top: handle.bottom
source: !isMobile ? "../terminal/Terminal.qml" : undefined
}
}
}
function clear()
......
......@@ -3,4 +3,7 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += app
linux:unix:!android {
message(Building Terminal for Linux KDE)
SUBDIRS += kde/qmltermwidget
}
This diff is collapsed.
*.pro.user
*.*~
~*.*
QT += KService KNotifications KNotifications KI18n
QT += KIOCore KIOFileWidgets KIOWidgets KNTLM
SUBDIRS += qmltermwidget
desktop.files += $$PWD../org.kde.index.desktop
desktop.path += /usr/share/applications
......
<RCC>
<qresource prefix="/">
<file alias="org/kde/kirigami/icons/application-menu.svg">3rdparty/breeze-icons/icons/actions/32/application-menu.svg</file>
<file alias="org/kde/kirigami/icons/document-decrypt.svg">3rdparty/breeze-icons/icons/actions/32/document-decrypt.svg</file>
<file alias="org/kde/kirigami/icons/folder-sync.svg">3rdparty/breeze-icons/icons/actions/32/folder-sync.svg</file>
<file alias="org/kde/kirigami/icons/go-next-symbolic.svg">3rdparty/breeze-icons/icons/actions/symbolic/go-next-symbolic.svg</file>
<file alias="org/kde/kirigami/icons/go-previous-symbolic.svg">3rdparty/breeze-icons/icons/actions/symbolic/go-previous-symbolic.svg</file>
<file alias="org/kde/kirigami/icons/go-up.svg">3rdparty/breeze-icons/icons/actions/22/go-up.svg</file>
<file alias="org/kde/kirigami/icons/handle-left.svg">3rdparty/breeze-icons/icons/actions/22/handle-left.svg</file>
<file alias="org/kde/kirigami/icons/overflow-menu.svg">3rdparty/breeze-icons/icons/actions/22/overflow-menu.svg</file>
<file alias="org/kde/kirigami/icons/handle-right.svg">3rdparty/breeze-icons/icons/actions/22/handle-right.svg</file>
<file alias="org/kde/kirigami/icons/view-list-icons.svg">3rdparty/breeze-icons/icons/actions/32/view-list-icons.svg</file>
<file alias="org/kde/kirigami/icons/applications-graphics.svg">3rdparty/breeze-icons/icons/categories/32/applications-graphics.svg</file>
<file alias="org/kde/kirigami/icons/image-multiple.svg">3rdparty/breeze-icons/icons/actions/22/image-multiple.svg</file>
<file alias="org/kde/kirigami/icons/image-frames.svg">3rdparty/breeze-icons/icons/actions/22/image-frames.svg</file>
<file alias="org/kde/kirigami/icons/image-folder-view.svg">3rdparty/breeze-icons/icons/actions/22/image-folder-view.svg</file>
<file alias="org/kde/kirigami/icons/object-rotate-right.svg">3rdparty/breeze-icons/icons/actions/22/object-rotate-right.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/process-stop.svg</file>
<file alias="org/kde/kirigami/icons/tag.svg">3rdparty/breeze-icons/icons/actions/22/tag.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/view-list-icons.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/view-list-details.svg</file>
<file alias="org/kde/kirigami/icons/view-fullscreen.svg">3rdparty/breeze-icons/icons/actions/22/view-fullscreen.svg</file>
<file alias="org/kde/kirigami/icons/view-preview.svg">3rdparty/breeze-icons/icons/actions/22/view-preview.svg</file>
<file alias="org/kde/kirigami/icons/view-refresh.svg">3rdparty/breeze-icons/icons/actions/22/view-refresh.svg</file>
<file alias="org/kde/kirigami/icons/window-close.svg">3rdparty/breeze-icons/icons/actions/22/window-close.svg</file>
<file alias="org/kde/kirigami/icons/list-add.svg">3rdparty/breeze-icons/icons/actions/22/list-add.svg</file>
<file alias="org/kde/kirigami/icons/list-remove.svg">3rdparty/breeze-icons/icons/actions/22/list-remove.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/image.svg</file>
<file alias="org/kde/kirigami/icons/go-previous.svg">3rdparty/breeze-icons/icons/actions/22/go-previous.svg</file>
<file alias="org/kde/kirigami/icons/go-next.svg">3rdparty/breeze-icons/icons/actions/22/go-next.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/go-last.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/go-home.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/go-first.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/go-down.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/edit-undo.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/edit-redo.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/draw-text.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/edit-clear.svg</file>
<file alias="org/kde/kirigami/icons/edit-find.svg">3rdparty/breeze-icons/icons/actions/22/edit-find.svg</file>
<file alias="org/kde/kirigami/icons/document-save-as.svg">3rdparty/breeze-icons/icons/actions/22/document-save-as.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/document-save.svg</file>
<file alias="org/kde/kirigami/icons/document-share.svg">3rdparty/breeze-icons/icons/actions/22/document-share.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/document-open.svg</file>
<file alias="org/kde/kirigami/icons/dialog-close.svg">3rdparty/breeze-icons/icons/actions/22/dialog-close.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/configure.svg</file>
<file alias="org/kde/kirigami/icons/love.svg">3rdparty/breeze-icons/icons/actions/22/love.svg</file>
<file alias="org/kde/kirigami/icons/application-menu.svg">3rdparty/breeze-icons/icons/actions/22/application-menu.svg</file>
<file alias="org/kde/kirigami/icons/folder.svg">3rdparty/breeze-icons/icons/places/32/folder.svg</file>
<file alias="org/kde/kirigami/icons/emblem-added.svg">3rdparty/breeze-icons/icons/emblems/16/emblem-added.svg</file>
<file alias="org/kde/kirigami/icons/emblem-remove.svg">3rdparty/breeze-icons/icons/emblems/16/emblem-remove.svg</file>
<file alias="org/kde/kirigami/icons/media-record-symbolic.svg">3rdparty/breeze-icons/icons/actions/symbolic/media-record-symbolic.svg</file>
<file>3rdparty/breeze-icons/icons/actions/22/folder-new.svg</file>
<file>3rdparty/breeze-icons/icons/places/22/folder.svg</file>
</qresource>
</RCC>
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