diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f758195..4c0dd65 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,327 +1,328 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/utils ${CMAKE_CURRENT_BINARY_DIR}/utils ${CMAKE_CURRENT_SOURCE_DIR}/utils/models ${CMAKE_CURRENT_BINARY_DIR}/utils/models ${CMAKE_CURRENT_SOURCE_DIR}/utils/model_template ${CMAKE_CURRENT_BINARY_DIR}/utils/model_template ${CMAKE_CURRENT_SOURCE_DIR}/kde ${CMAKE_CURRENT_BINARY_DIR}/kde ) set(mauikit_SRCS mauikit.cpp utils/fmstatic.cpp utils/mauiapp.cpp utils/handy.cpp utils/models/pathlist.cpp utils/model_template/mauilist.cpp utils/model_template/mauimodel.cpp ) set(mauikit_HDRS mauikit.h utils/fmstatic.h utils/fmh.h utils/utils.h utils/handy.h utils/models/pathlist.h utils/mauiapp.h utils/model_template/mauilist.h utils/model_template/mauimodel.h ) if(${COMPONENT_ACCOUNTS}) message(STATUS "INCLUDING ACCOUNTS COMPONENT") include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/utils/accounts ${CMAKE_CURRENT_BINARY_DIR}/utils/accounts ) set(accounts_SRCS utils/accounts/mauiaccounts.cpp utils/accounts/accountsdb.cpp utils/accounts/accounts.qrc ) set(accounts_HDRS utils/accounts/mauiaccounts.h utils/accounts/accountsdb.h ) add_definitions(-DCOMPONENT_ACCOUNTS) endif() if(${COMPONENT_EDITOR}) message(STATUS "INCLUDING EDITOR COMPONENT") set(editor_SRCS utils/editor/documenthandler.cpp ) set(editor_HDRS utils/editor/documenthandler.h ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/utils/editor ${CMAKE_CURRENT_BINARY_DIR}/utils/editor ) add_definitions(-DCOMPONENT_EDITOR) endif() if(${COMPONENT_FM}) message(STATUS "INCLUDING FM COMPONENT") set(fm_SRCS fm/fm.cpp fm/fmlist.cpp fm/placeslist.cpp fm/downloader.cpp ) set(fm_HDRS fm/fm.h fm/fmlist.h fm/placeslist.h fm/downloader.h ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/fm ${CMAKE_CURRENT_BINARY_DIR}/fm ) add_definitions(-DCOMPONENT_FM) endif() if(${COMPONENT_TAGGING}) message(STATUS "INCLUDING TAGGING COMPONENT") set(tagging_SRCS utils/tagging/tagging.cpp utils/tagging/tagdb.cpp utils/tagging/tagsmodel.cpp utils/tagging/tagslist.cpp utils/tagging/tagging.qrc ) set(tagging_HDRS utils/tagging/tag.h utils/tagging/tagging.h utils/tagging/tagdb.h utils/tagging/tagsmodel.h utils/tagging/tagslist.h ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/utils/tagging ${CMAKE_CURRENT_BINARY_DIR}/utils/tagging ) add_definitions(-DCOMPONENT_TAGGING) endif() if(${COMPONENT_SYNCING}) message(STATUS "INCLUDING SYNCING COMPONENT") set(syncing_SRCS utils/syncing/syncing.cpp utils/syncing/libwebdavclient/lib/WebDAVClient.cpp utils/syncing/libwebdavclient/lib/dto/WebDAVItem.cpp utils/syncing/libwebdavclient/lib/utils/Environment.cpp utils/syncing/libwebdavclient/lib/utils/NetworkHelper.cpp utils/syncing/libwebdavclient/lib/utils/WebDAVReply.cpp utils/syncing/libwebdavclient/lib/utils/XMLHelper.cpp ) set(syncing_HDRS utils/syncing/syncing.h utils/syncing/libwebdavclient/lib/WebDAVClient.hpp utils/syncing/libwebdavclient/lib/dto/WebDAVItem.hpp utils/syncing/libwebdavclient/lib/utils/Environment.hpp utils/syncing/libwebdavclient/lib/utils/NetworkHelper.hpp utils/syncing/libwebdavclient/lib/utils/WebDAVReply.hpp utils/syncing/libwebdavclient/lib/utils/XMLHelper.hpp ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/utils/syncing ${CMAKE_CURRENT_BINARY_DIR}/utils/syncing ${CMAKE_CURRENT_SOURCE_DIR}/utils/syncing/libwebdavclient/lib ${CMAKE_CURRENT_SOURCE_DIR}/utils/syncing/libwebdavclient/lib/utils ${CMAKE_CURRENT_SOURCE_DIR}/utils/syncing/libwebdavclient/lib/dto ) add_definitions(-DCOMPONENT_SYNCING) endif() if(${COMPONENT_STORE}) message(STATUS "INCLUDING STORE COMPONENT") set(store_SRCS utils/store/store.cpp utils/store/storemodel.cpp utils/store/storelist.cpp utils/store/store.qrc ) set(store_HDRS utils/store/store.h utils/store/storemodel.h utils/store/storelist.h ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/utils/store ${CMAKE_CURRENT_BINARY_DIR}/utils/store ) add_definitions(-DCOMPONENT_STORE) endif() #use dbus on linux, bsd etc, but not andoid and apple stuff #options - for the appimage option(IS_APPIMAGE_PACKAGE "If set to true then the icons and styled is packaged as well" OFF) if(ANDROID OR IS_APPIMAGE_PACKAGE OR MAUIKIT_STYLE) if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/maui-style/icons/luv-icon-theme/.git) find_package(Git REQUIRED) execute_process(COMMAND ${GIT_EXECUTABLE} clone --depth 1 https://github.com/milohr/luv-icon-theme.git ${CMAKE_CURRENT_SOURCE_DIR}/maui-style/icons/luv-icon-theme) endif() list(APPEND mauikit_SRCS maui-style/icons.qrc) endif() if (ANDROID) add_subdirectory(android) set(mauikit_Android_SRCS android/mauiandroid.cpp ) kde_enable_exceptions(MauiKit PRIVATE) else() set(mauikit_KDE_SRCS kde/mauikde.cpp kde/kdeconnect.cpp ) set(mauikit_KDE_HDRS kde/mauikde.h kde/kdeconnect.h ) endif() add_library(MauiKit ${fm_HDRS} ${fm_SRCS} ${accounts_HDRS} ${accounts_SRCS} ${editor_HDRS} ${editor_SRCS} ${syncing_HDRS} ${syncing_SRCS} ${store_SRCS} ${store_HDRS} ${tagging_HDRS} ${tagging_SRCS} ${mauikit_HDRS} ${mauikit_SRCS} ${mauikit_Android_SRCS} ${mauikit_KDE_HDRS} ${mauikit_KDE_SRCS} maui-style/style.qrc assets.qrc mauikit.qrc ) if(ANDROID) target_link_libraries(MauiKit PRIVATE Qt5::AndroidExtras Qt5::WebView jnigraphics) target_include_directories(MauiKit PRIVATE android) install(FILES android/mauiandroid.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/MauiKit COMPONENT Devel) install(DIRECTORY android/ DESTINATION ${KDE_INSTALL_DATAROOTDIR}/MauiKitAndroid COMPONENT Devel) install(FILES MauiKit-android-dependencies.xml DESTINATION ${KDE_INSTALL_LIBDIR}) else() target_link_libraries(MauiKit PRIVATE Qt5::WebEngine) endif() target_link_libraries(MauiKit PUBLIC Qt5::Core Qt5::Sql Qt5::Gui KF5::I18n KF5::ConfigCore KF5::KIOCore KF5::KIOWidgets KF5::KIOFileWidgets PRIVATE Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::Svg Qt5::Network Qt5::Xml KF5::I18n KF5::Service KF5::KIONTLM KF5::ConfigWidgets ) if(${COMPONENT_EDITOR}) find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED COMPONENTS SyntaxHighlighting) target_link_libraries(MauiKit PRIVATE KF5::SyntaxHighlighting) endif() if(${COMPONENT_STORE}) find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED COMPONENTS Attica) target_link_libraries(MauiKit PUBLIC KF5::Attica) endif() if(IS_APPIMAGE_PACKAGE) target_compile_definitions(MauiKit PUBLIC APPIMAGE_PACKAGE) endif() generate_export_header(MauiKit BASE_NAME MauiKit) install(TARGETS MauiKit EXPORT MauiKitTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) target_include_directories(MauiKit INTERFACE "$") add_custom_target(copy) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/org/kde/mauikit) add_custom_command(TARGET copy PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/controls ${CMAKE_BINARY_DIR}/bin/org/kde/mauikit/) add_dependencies(MauiKit copy) install(DIRECTORY controls/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/mauikit) install(TARGETS MauiKit DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/mauikit) install(FILES ${mauikit_HDRS} ${mauikit_KDE_HDRS} ${tagging_HDRS} ${fm_HDRS} ${syncing_HDRS} ${store_HDRS} + ${editor_HDRS} ${accounts_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/mauikit_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/MauiKit COMPONENT Devel) ##INSTALL MAUI STYLE install(DIRECTORY maui-style DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2) diff --git a/src/controls/Editor.qml b/src/controls/Editor.qml index 4771c08..bb9fb1a 100644 --- a/src/controls/Editor.qml +++ b/src/controls/Editor.qml @@ -1,314 +1,316 @@ import QtQuick 2.10 import QtQuick.Controls 2.10 import QtQuick.Layouts 1.3 import org.kde.mauikit 1.0 as Maui import org.kde.kirigami 2.7 as Kirigami import "private" Maui.Page { id: control Kirigami.Theme.inherit: false Kirigami.Theme.colorSet: Kirigami.Theme.View property bool showLineCount : true property bool showSyntaxHighlighting: true property alias body : body property alias document : document property alias scrollView: _scrollView property alias text: body.text property alias uppercase: document.uppercase property alias underline: document.underline property alias italic: document.italic property alias bold: document.bold property alias canRedo: body.canRedo + + property alias fileUrl : document.fileUrl Maui.DocumentHandler { id: document document: body.textDocument cursorPosition: body.cursorPosition selectionStart: body.selectionStart selectionEnd: body.selectionEnd textColor: control.Kirigami.Theme.textColor backgroundColor: control.Kirigami.Theme.backgroundColor onError: { body.text = message body.visible = true } } Row { z: _scrollView.z +1 visible: showLineCount anchors { right: parent.right bottom: parent.bottom margins: Maui.Style.space.big } width: implicitWidth height: implicitHeight Label { text: body.length + " / " + body.lineCount color: control.Kirigami.Theme.textColor opacity: 0.5 font.pointSize: Maui.Style.fontSizes.medium } } Menu { id: documentMenu z: 999 MenuItem { text: qsTr("Copy") onTriggered: body.copy() enabled: body.selectedText.length } MenuItem { text: qsTr("Cut") onTriggered: body.cut() enabled: !body.readOnly && body.selectedText.length } MenuItem { text: qsTr("Paste") onTriggered: body.paste() enabled: !body.readOnly } MenuItem { text: qsTr("Select all") onTriggered: body.selectAll() } MenuItem { text: qsTr("Web search") onTriggered: Qt.openUrlExternally("https://www.google.com/search?q="+body.selectedText) enabled: body.selectedText.length } } headBar.visible: !body.readOnly headBar.leftContent: [ ToolButton { icon.name: "edit-undo" enabled: body.canUndo onClicked: body.undo() opacity: enabled ? 1 : 0.5 }, ToolButton { icon.name: "edit-redo" enabled: body.canRedo onClicked: body.redo() opacity: enabled ? 1 : 0.5 }, Row { id: _editingActions visible: document.isRich && !body.readOnly ToolButton { icon.name: "format-text-bold" focusPolicy: Qt.TabFocus icon.color: checked ? control.Kirigami.Theme.highlightColor : control.Kirigami.Theme.textColor checkable: false checked: document.bold onClicked: document.bold = !document.bold } ToolButton { icon.name: "format-text-italic" icon.color: checked ? control.Kirigami.Theme.highlightColor : control.Kirigami.Theme.textColor focusPolicy: Qt.TabFocus checkable: false checked: document.italic onClicked: document.italic = !document.italic } ToolButton { icon.name: "format-text-underline" icon.color: checked ? control.Kirigami.Theme.highlightColor : control.Kirigami.Theme.textColor focusPolicy: Qt.TabFocus checkable: true checked: document.underline onClicked: document.underline = !document.underline } ToolButton { icon.name: "format-text-uppercase" icon.color: checked ? control.Kirigami.Theme.highlightColor : control.Kirigami.Theme.textColor focusPolicy: Qt.TabFocus checkable: true checked: document.uppercase onClicked: document.uppercase = !document.uppercase } } ] // footBar.visible: !body.readOnly footBar.rightContent: [ ToolButton { icon.name: "zoom-in" onClicked: zoomIn() }, ToolButton { icon.name: "zoom-out" onClicked: zoomOut() }, ComboBox { visible: control.showSyntaxHighlighting id: languagesListComboBox model: document.getLanguageNameList() onCurrentIndexChanged: document.formatName = languagesListComboBox.model[currentIndex] } ] ColumnLayout { anchors.fill: parent spacing: 0 Repeater { model: document.alerts Maui.ToolBar { property var alert : model.alert Layout.fillWidth: true Kirigami.Theme.backgroundColor: { switch(alert.level) { case 0: return Kirigami.Theme.positiveTextColor case 1: return Kirigami.Theme.neutralTextColor case 2: return Kirigami.Theme.negativeTextColor } } leftContent: Maui.ListItemTemplate { Layout.fillWidth: true Layout.fillHeight: true label1.text: alert.title label2.text: alert.body } rightContent: Repeater { model: alert.actionLabels() Button { text: modelData onClicked: alert.triggerAction(index) Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.2) Kirigami.Theme.textColor: Kirigami.Theme.textColor } } } } Kirigami.ScrollablePage { id: _scrollView Layout.fillWidth: true Layout.fillHeight: true contentWidth: width contentHeight: body.implicitHeight leftPadding: 0 rightPadding: 0 topPadding: 0 bottomPadding: 0 TextArea { id: body - text: document.text + text: document.text font.family: languagesListComboBox.currentIndex > 0 ? "Monospace" : undefined placeholderText: qsTr("Body") selectByKeyboard :!Kirigami.Settings.isMobile selectByMouse : !Kirigami.Settings.isMobile textFormat: TextEdit.AutoText palette.text: control.Kirigami.Theme.textColor color: control.Kirigami.Theme.textColor font.pointSize: Maui.Style.fontSizes.large wrapMode: TextEdit.WrapAnywhere activeFocusOnPress: true activeFocusOnTab: true persistentSelection: true background: Rectangle { color: document.backgroundColor implicitWidth: body.implicitWidth implicitHeight: Math.max(body.implicitHeight, control.height) } // onPressAndHold: isMobile ? documentMenu.popup() : undefined onPressed: { if(!Kirigami.Settings.isMobile && event.button === Qt.RightButton) documentMenu.popup() } } // ScrollBar.vertical.height: _scrollView.height - body.topPadding // ScrollBar.vertical.y: body.topPadding } } function zoomIn() { body.font.pointSize = body.font.pointSize + 2 } function zoomOut() { body.font.pointSize = body.font.pointSize - 2 } } diff --git a/src/controls/FloatingButton.qml b/src/controls/FloatingButton.qml index ed2c7e4..a63a3d3 100644 --- a/src/controls/FloatingButton.qml +++ b/src/controls/FloatingButton.qml @@ -1,68 +1,71 @@ /* * Copyright 2018 Camilo Higuita * * 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.10 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.10 import org.kde.kirigami 2.7 as Kirigami import org.kde.mauikit 1.0 as Maui import QtGraphicalEffects 1.0 MouseArea { id: control z: 999 height: Maui.Style.toolBarHeight width: height property alias icon : _button.icon property alias text: _button.text property alias display: _button.display signal clicked() Rectangle { id: _rec anchors.fill: parent color: Kirigami.Theme.highlightColor radius: Maui.Style.radiusV ToolButton { id : _button - anchors.centerIn: parent + anchors.fill: parent Kirigami.Theme.textColor: Kirigami.Theme.highlightedTextColor + icon.height: Maui.Style.iconSizes.medium + icon.width: Maui.Style.iconSizes.medium + onClicked: control.clicked() } } DropShadow { anchors.fill: parent cached: true horizontalOffset: 0 verticalOffset: 0 radius: 8.0 samples: 16 color: "#333" smooth: true source: _rec } } diff --git a/src/utils/editor/documenthandler.cpp b/src/utils/editor/documenthandler.cpp index 19c7d9c..9cbbf5f 100644 --- a/src/utils/editor/documenthandler.cpp +++ b/src/utils/editor/documenthandler.cpp @@ -1,718 +1,739 @@ /**************************************************************************** * * ** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license ** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are ** met: ** * Redistributions of source code must retain the above copyright ** notice, this list of conditions and the following disclaimer. ** * Redistributions in binary form must reproduce the above copyright ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. ** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** ** $QT_END_LICENSE$ ** ****************************************************************************/ #include "documenthandler.h" #include #include #include #include #include #include #include #include #include #include #include #include #include "fmh.h" #include "utils.h" #ifdef STATIC_MAUIKIT #include #include #include #include #else #include #include #include #include #endif /** * Global Variables */ KSyntaxHighlighting::Repository *DocumentHandler::m_repository = nullptr; int DocumentHandler::m_instanceCount = 0; Alerts::Alerts(QObject* parent) : QAbstractListModel(parent) {} Alerts::~Alerts() { qDebug()<< "REMOVING ALL DOCUMENTS ALERTS"; for(auto *alert : this->m_alerts) + { delete alert; + alert = nullptr; + } } QVariant Alerts::data(const QModelIndex& index, int role) const { if(role == ROLES::ALERT) return QVariant::fromValue(this->m_alerts.at(index.row())); return QVariant(); } int Alerts::rowCount(const QModelIndex& parent) const { if (parent.isValid()) return 0; return this->m_alerts.count(); } QHash Alerts::roleNames() const { return {{ROLES::ALERT, "alert"}}; } void Alerts::append(DocumentAlert *alert) { const auto index = this->rowCount(); beginInsertRows(QModelIndex(), index, index); // watch out for when the alert is done: such as when an action is triggered connect(alert, &DocumentAlert::done, [&](int index) { this->beginRemoveRows(QModelIndex(), index, index); auto item = this->m_alerts.takeAt(index); - item->deleteLater(); + if(item) + { + item->deleteLater(); + item = nullptr; + } this->endRemoveRows(); }); alert->setIndex(index); this->m_alerts << alert; endInsertRows(); } void FileLoader::loadFile(const QUrl& url) { if (FMH::fileExists(url)) { QFile file(url.toLocalFile()); if (file.open(QFile::ReadOnly)) { const auto array = file.readAll(); const bool isHtml = QFileInfo(url.toLocalFile()).suffix().contains(QLatin1String("htm")); QTextCodec *codec = isHtml ? QTextCodec::codecForHtml(array) : QTextCodec::codecForUtfText(array, QTextCodec::codecForLocale()); emit this->fileReady(codec->toUnicode(array), url); } } } DocumentAlert * DocumentHandler::externallyModifiedAlert() { auto alert = new DocumentAlert(tr("File changed externally"), tr("You can reload the file or save your changes now"), DocumentAlert::WARNING_LEVEL); const auto reloadAction = [&]() { emit this->loadFile(this->fileUrl()); }; const auto autoReloadAction = [&]() { this->setAutoReload(true); emit this->loadFile(this->fileUrl()); }; alert->setActions({{tr("Reload"), reloadAction}, {tr("Auto Reload"), autoReloadAction}, {tr("Ignore"), [&](){}}}); return alert; } DocumentAlert * DocumentHandler::canNotSaveAlert(const QString &details) { auto alert = new DocumentAlert(tr("File can not be saved"), details, DocumentAlert::DANGER_LEVEL); alert->setActions({{tr("Ignore"), [&](){}}}); return alert; } DocumentAlert * DocumentHandler::missingAlert() { auto alert = new DocumentAlert(tr("Your file was removed"), tr("This file does not longer exists in your local storage, however you can save it again"), DocumentAlert::DANGER_LEVEL); const auto saveAction = [&]() { this->saveAs(this->fileUrl()); }; alert->setActions({{tr("Save"), saveAction}}); return alert; } DocumentHandler::DocumentHandler(QObject *parent) : QObject(parent) , m_document(nullptr) , m_watcher(new QFileSystemWatcher(this)) , m_cursorPosition(-1) , m_selectionStart(0) , m_selectionEnd(0) , m_highlighter(new KSyntaxHighlighting::SyntaxHighlighter(this)) , m_alerts(new Alerts(this)) { ++m_instanceCount; //start file loader thread implementation { FileLoader *m_loader = new FileLoader; m_loader->moveToThread(&m_worker); connect(&m_worker, &QThread::finished, m_loader, &QObject::deleteLater); connect(this, &DocumentHandler::loadFile, m_loader, &FileLoader::loadFile); connect(m_loader, &FileLoader::fileReady, [&](QString array, QUrl url) - { - if (QTextDocument *doc = textDocument()) - doc->setModified(false); - + { this->isRich = QFileInfo(url.toLocalFile()).suffix().contains(QLatin1String("rtf"));// emit this->isRichChanged(); this->setText(array); + if (QTextDocument *doc = this->textDocument()) + doc->setModified(false); this->setFormatName(DocumentHandler::getLanguageNameFromFileName(url)); emit this->loaded(url); - reset(); + reset(); }); m_worker.start(); } //end file loader thread implementation connect(this->m_watcher, &QFileSystemWatcher::fileChanged, [&](QString url) - { + { if(this->fileUrl() == QUrl::fromLocalFile(url)) { //THE FILE WAS REMOVED if(!FMH::fileExists(this->fileUrl())) { this->m_alerts->append(DocumentHandler::missingAlert()); return; } //THE FILE CHANGED BUT STILL EXISTS LOCALLY if(m_internallyModified) { m_internallyModified = false; return; } this->setExternallyModified(true); if(!this->m_autoReload) { this->m_alerts->append(DocumentHandler::externallyModifiedAlert()); return; } emit this->loadFile(this->fileUrl()); } }); } DocumentHandler::~DocumentHandler() { - m_worker.quit(); - m_worker.wait(); + this->m_worker.quit(); + this->m_worker.wait(); - --m_instanceCount; + --DocumentHandler::m_instanceCount; - if (!m_instanceCount) + if (!DocumentHandler::m_instanceCount) { delete DocumentHandler::m_repository; DocumentHandler::m_repository = nullptr; } } void DocumentHandler::setText(const QString &text) { - if (text != m_text) + if (text != this->m_text) { - m_text = text; + this->m_text = text; emit textChanged(); } } bool DocumentHandler::getAutoReload() const { return this->m_autoReload; } void DocumentHandler::setAutoReload(const bool& value) { if(value == this->m_autoReload) return; this->m_autoReload = value; emit this->autoReloadChanged(); } bool DocumentHandler::getModified() const { - return this->textDocument()->isModified(); + if (auto doc = this->textDocument()) + return doc->isModified(); + + return false; } bool DocumentHandler::getExternallyModified() const { return this->m_externallyModified; } void DocumentHandler::setExternallyModified(const bool& value) { if(value == this->m_externallyModified) return; this->m_externallyModified = value; emit this->externallyModifiedChanged(); } void DocumentHandler::setStyle() { if (!DocumentHandler::m_repository) DocumentHandler::m_repository = new KSyntaxHighlighting::Repository(); const auto isDark = UTIL::isDark(this->m_backgroundColor); const auto style = DocumentHandler::m_repository->defaultTheme(isDark ?KSyntaxHighlighting::Repository::DarkTheme : KSyntaxHighlighting::Repository::LightTheme); m_highlighter->setTheme(style); m_highlighter->setDefinition(DocumentHandler::m_repository->definitionForName(this->m_formatName)); } QString DocumentHandler::formatName() const { return this->m_formatName; } void DocumentHandler::setFormatName(const QString& formatName) { if (m_formatName != formatName) { m_formatName = formatName; emit this->formatNameChanged(); this->setStyle(); } } QColor DocumentHandler::getBackgroundColor() const { return this->m_backgroundColor; } void DocumentHandler::setBackgroundColor(const QColor& color) { if(this->m_backgroundColor == color) return; this->m_backgroundColor = color; emit this->backgroundColorChanged(); this->setStyle(); } Alerts *DocumentHandler::getAlerts() const { return this->m_alerts; } QQuickTextDocument *DocumentHandler::document() const { return m_document; } void DocumentHandler::setDocument(QQuickTextDocument *document) { if (document == m_document) return; m_document = document; emit documentChanged(); - m_highlighter->setDocument(m_document->textDocument()); + if(auto doc = this->textDocument()) + { + doc->setModified(false); + m_highlighter->setDocument(doc); + connect(doc, &QTextDocument::modificationChanged, this, &DocumentHandler::modifiedChanged); + } } int DocumentHandler::cursorPosition() const { return m_cursorPosition; } void DocumentHandler::setCursorPosition(int position) { if (position == m_cursorPosition) return; m_cursorPosition = position; reset(); emit cursorPositionChanged(); } int DocumentHandler::selectionStart() const { return m_selectionStart; } void DocumentHandler::setSelectionStart(int position) { if (position == m_selectionStart) return; m_selectionStart = position; emit selectionStartChanged(); } int DocumentHandler::selectionEnd() const { return m_selectionEnd; } void DocumentHandler::setSelectionEnd(int position) { if (position == m_selectionEnd) return; m_selectionEnd = position; emit selectionEndChanged(); } QString DocumentHandler::fontFamily() const { QTextCursor cursor = textCursor(); if (cursor.isNull()) return QString(); QTextCharFormat format = cursor.charFormat(); return format.font().family(); } void DocumentHandler::setFontFamily(const QString &family) { QTextCharFormat format; format.setFontFamily(family); mergeFormatOnWordOrSelection(format); emit fontFamilyChanged(); } QColor DocumentHandler::textColor() const { QTextCursor cursor = textCursor(); if (cursor.isNull()) return QColor(Qt::black); QTextCharFormat format = cursor.charFormat(); return format.foreground().color(); } void DocumentHandler::setTextColor(const QColor &color) { QTextCharFormat format; format.setForeground(QBrush(color)); mergeFormatOnWordOrSelection(format); emit textColorChanged(); } Qt::Alignment DocumentHandler::alignment() const { QTextCursor cursor = textCursor(); if (cursor.isNull()) return Qt::AlignLeft; return textCursor().blockFormat().alignment(); } void DocumentHandler::setAlignment(Qt::Alignment alignment) { QTextBlockFormat format; format.setAlignment(alignment); QTextCursor cursor = textCursor(); cursor.mergeBlockFormat(format); emit alignmentChanged(); } bool DocumentHandler::bold() const { QTextCursor cursor = textCursor(); if (cursor.isNull()) return false; return textCursor().charFormat().fontWeight() == QFont::Bold; } void DocumentHandler::setBold(bool bold) { QTextCharFormat format; format.setFontWeight(bold ? QFont::Bold : QFont::Normal); mergeFormatOnWordOrSelection(format); emit boldChanged(); } bool DocumentHandler::uppercase() const { QTextCursor cursor = textCursor(); if (cursor.isNull()) return false; return textCursor().charFormat().fontCapitalization() == QFont::AllUppercase; } void DocumentHandler::setUppercase(bool uppercase) { QTextCharFormat format; format.setFontCapitalization(uppercase ? QFont::AllUppercase : QFont::AllLowercase); mergeFormatOnWordOrSelection(format); emit uppercaseChanged(); } bool DocumentHandler::italic() const { QTextCursor cursor = textCursor(); if (cursor.isNull()) return false; return textCursor().charFormat().fontItalic(); } void DocumentHandler::setItalic(bool italic) { QTextCharFormat format; format.setFontItalic(italic); mergeFormatOnWordOrSelection(format); emit italicChanged(); } bool DocumentHandler::underline() const { QTextCursor cursor = textCursor(); if (cursor.isNull()) return false; return textCursor().charFormat().fontUnderline(); } void DocumentHandler::setUnderline(bool underline) { QTextCharFormat format; format.setFontUnderline(underline); mergeFormatOnWordOrSelection(format); emit underlineChanged(); } bool DocumentHandler::getIsRich() const { return this->isRich; } int DocumentHandler::fontSize() const { QTextCursor cursor = textCursor(); if (cursor.isNull()) return 0; QTextCharFormat format = cursor.charFormat(); return format.font().pointSize(); } void DocumentHandler::setFontSize(int size) { if (size <= 0) return; QTextCursor cursor = textCursor(); if (cursor.isNull()) return; if (!cursor.hasSelection()) cursor.select(QTextCursor::WordUnderCursor); if (cursor.charFormat().property(QTextFormat::FontPointSize).toInt() == size) return; QTextCharFormat format; format.setFontPointSize(size); mergeFormatOnWordOrSelection(format); emit fontSizeChanged(); } QString DocumentHandler::fileName() const { const QString filePath = QQmlFile::urlToLocalFileOrQrc(m_fileUrl); const QString fileName = QFileInfo(filePath).fileName(); if (fileName.isEmpty()) return QStringLiteral("untitled.txt"); return fileName; } QString DocumentHandler::fileType() const { return QFileInfo(fileName()).suffix(); } QUrl DocumentHandler::fileUrl() const { return m_fileUrl; } +void DocumentHandler::setFileUrl(const QUrl& url) +{ + this->load(url); +} + void DocumentHandler::load(const QUrl &fileUrl) { - qDebug()<< "TRYING TO LOAD FILE << " << fileUrl; + qDebug()<< "TRYING TO LOAD FILE << " << fileUrl << fileUrl.isEmpty(); if (fileUrl == m_fileUrl) return; + m_fileUrl = fileUrl; + emit fileUrlChanged(); + + + + if(fileUrl.isLocalFile() && !FMH::fileExists(fileUrl)) + return; + QQmlEngine *engine = qmlEngine(this); if (!engine) { qWarning() << "load() called before DocumentHandler has QQmlEngine"; return; } - const QUrl path = QQmlFileSelector::get(engine)->selector()->select(fileUrl); - const QString fileName = QQmlFile::urlToLocalFileOrQrc(path); - - m_fileUrl = fileUrl; - emit fileUrlChanged(); - + this->m_watcher->removePaths(this->m_watcher->files()); this->m_watcher->addPath(m_fileUrl.toLocalFile()); emit this->loadFile(m_fileUrl); } void DocumentHandler::saveAs(const QUrl &fileUrl) { QTextDocument *doc = this->textDocument(); if (!doc) return; const QString filePath = fileUrl.toLocalFile(); const bool isHtml = QFileInfo(filePath).suffix().contains(QLatin1String("html")); this->m_internallyModified = true; QFile file(filePath); if (!file.open(QFile::WriteOnly | QFile::Truncate | (isHtml ? QFile::NotOpen : QFile::Text))) { emit error(tr("Cannot save: ") + file.errorString()); this->m_alerts->append(this->canNotSaveAlert(file.errorString())); }else { QTextStream out(&file); out.setCodec("UTF-8"); out << (isHtml ? doc->toHtml() : doc->toPlainText()).toUtf8(); file.close(); + doc->setModified(false); if (fileUrl == m_fileUrl) return; m_fileUrl = fileUrl; - emit fileUrlChanged(); - - doc->setModified(false); + emit fileUrlChanged(); } } const QString DocumentHandler::getLanguageNameFromFileName(const QUrl& fileName) { if (!DocumentHandler::m_repository) DocumentHandler::m_repository = new KSyntaxHighlighting::Repository(); return DocumentHandler::m_repository->definitionForFileName(fileName.toString()).name(); } const QStringList DocumentHandler::getLanguageNameList() { if (!DocumentHandler::m_repository) m_repository = new KSyntaxHighlighting::Repository(); const auto definitions = DocumentHandler::m_repository->definitions(); return std::accumulate(definitions.constBegin(), definitions.constEnd(), QStringList(), [](QStringList &languages, const auto &definition ) -> QStringList { languages.append(definition.name()); return languages; }); } void DocumentHandler::reset() { emit fontFamilyChanged(); emit alignmentChanged(); emit boldChanged(); emit italicChanged(); emit underlineChanged(); emit fontSizeChanged(); emit textColorChanged(); } QTextCursor DocumentHandler::textCursor() const { QTextDocument *doc = textDocument(); if (!doc) return QTextCursor(); QTextCursor cursor = QTextCursor(doc); if (m_selectionStart != m_selectionEnd) { cursor.setPosition(m_selectionStart); cursor.setPosition(m_selectionEnd, QTextCursor::KeepAnchor); } else { cursor.setPosition(m_cursorPosition); } return cursor; } QTextDocument *DocumentHandler::textDocument() const { if (!m_document) return nullptr; return m_document->textDocument(); } void DocumentHandler::mergeFormatOnWordOrSelection(const QTextCharFormat &format) { QTextCursor cursor = textCursor(); if (!cursor.hasSelection()) cursor.select(QTextCursor::WordUnderCursor); cursor.mergeCharFormat(format); } diff --git a/src/utils/editor/documenthandler.h b/src/utils/editor/documenthandler.h index 2a8ed8c..6bc1543 100644 --- a/src/utils/editor/documenthandler.h +++ b/src/utils/editor/documenthandler.h @@ -1,355 +1,366 @@ /**************************************************************************** * * ** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license ** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are ** met: ** * Redistributions of source code must retain the above copyright ** notice, this list of conditions and the following disclaimer. ** * Redistributions in binary form must reproduce the above copyright ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. ** * Neither the name of The Qt Company Ltd nor the names of its ** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** ** $QT_END_LICENSE$ ** ****************************************************************************/ #ifndef DOCUMENTHANDLER_H #define DOCUMENTHANDLER_H #include #include #include #include #include #include +#ifndef STATIC_MAUIKIT +#include "mauikit_export.h" +#endif + QT_BEGIN_NAMESPACE class QFileSystemWatcher; class QTextDocument; class QQuickTextDocument; QT_END_NAMESPACE namespace KSyntaxHighlighting { class Repository; class SyntaxHighlighter; } - struct AlertAction { QString label; std::function action; } ; class DocumentAlert : public QObject { Q_OBJECT Q_PROPERTY(QString title MEMBER m_title CONSTANT FINAL) Q_PROPERTY(QString body MEMBER m_body CONSTANT FINAL) Q_PROPERTY(uint level MEMBER m_level CONSTANT FINAL) public: enum LEVEL : uint { INFO_LEVEL = 0, WARNING_LEVEL = 1, DANGER_LEVEL = 2 }; DocumentAlert(const QString &title, const QString &body, const uint &level, QObject *parent = nullptr) : QObject(parent) { this->m_title = title; this->m_body = body; this->m_level = level; } void setIndex(const int &index) { this->m_index = index; } void setActions(QVector actions) { this->m_actions = actions; } private: QString m_title; QString m_body; uint m_level; int m_index = -1; QVector m_actions; public slots: QStringList actionLabels() const { return std::accumulate(this->m_actions.constBegin(), this->m_actions.constEnd(), QStringList(), [](QStringList &labels, const AlertAction &action) -> QStringList { labels << action.label; return labels; }); } void triggerAction(const int &index) { this->m_actions.takeAt(index).action(); emit this->done(m_index); } signals: void done(int index); }; class Alerts : public QAbstractListModel { Q_OBJECT public: enum ROLES : uint { ALERT = Qt::DisplayRole + 1 }; explicit Alerts(QObject *parent = nullptr); ~Alerts(); QVariant data(const QModelIndex & index, int role) const override final; int rowCount(const QModelIndex &parent = QModelIndex()) const override final; QHash roleNames() const override; void append(DocumentAlert *alert); private: QVector m_alerts; }; class FileLoader : public QObject { Q_OBJECT public slots: void loadFile(const QUrl &url); signals: void fileReady(QString array, QUrl url); }; + +#ifdef STATIC_MAUIKIT class DocumentHandler : public QObject +#else +class MAUIKIT_EXPORT DocumentHandler : public QObject +#endif { Q_OBJECT Q_PROPERTY(QQuickTextDocument *document READ document WRITE setDocument NOTIFY documentChanged) Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged) Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged) Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged) Q_PROPERTY(QColor textColor READ textColor WRITE setTextColor NOTIFY textColorChanged) Q_PROPERTY(QString fontFamily READ fontFamily WRITE setFontFamily NOTIFY fontFamilyChanged) Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged) Q_PROPERTY(bool bold READ bold WRITE setBold NOTIFY boldChanged) Q_PROPERTY(bool uppercase READ uppercase WRITE setUppercase NOTIFY uppercaseChanged) Q_PROPERTY(bool italic READ italic WRITE setItalic NOTIFY italicChanged) Q_PROPERTY(bool underline READ underline WRITE setUnderline NOTIFY underlineChanged) Q_PROPERTY(bool isRich READ getIsRich NOTIFY isRichChanged) Q_PROPERTY(int fontSize READ fontSize WRITE setFontSize NOTIFY fontSizeChanged) Q_PROPERTY(QString fileName READ fileName NOTIFY fileUrlChanged) Q_PROPERTY(QString fileType READ fileType NOTIFY fileUrlChanged) - Q_PROPERTY(QUrl fileUrl READ fileUrl NOTIFY fileUrlChanged) + Q_PROPERTY(QUrl fileUrl READ fileUrl WRITE setFileUrl NOTIFY fileUrlChanged) Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged) Q_PROPERTY(bool externallyModified READ getExternallyModified WRITE setExternallyModified NOTIFY externallyModifiedChanged) - Q_PROPERTY(bool modified READ getModified) + Q_PROPERTY(bool modified READ getModified NOTIFY modifiedChanged) Q_PROPERTY(bool autoReload READ getAutoReload WRITE setAutoReload NOTIFY autoReloadChanged) Q_PROPERTY(QString formatName READ formatName WRITE setFormatName NOTIFY formatNameChanged) Q_PROPERTY(Alerts *alerts READ getAlerts CONSTANT FINAL) Q_PROPERTY(QColor backgroundColor READ getBackgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged) public: explicit DocumentHandler(QObject *parent = nullptr); ~DocumentHandler(); QQuickTextDocument *document() const; void setDocument(QQuickTextDocument *document); int cursorPosition() const; void setCursorPosition(int position); int selectionStart() const; void setSelectionStart(int position); int selectionEnd() const; void setSelectionEnd(int position); QString fontFamily() const; void setFontFamily(const QString &family); QColor textColor() const; void setTextColor(const QColor &color); Qt::Alignment alignment() const; void setAlignment(Qt::Alignment alignment); bool bold() const; void setBold(bool bold); bool uppercase() const; void setUppercase(bool uppercase); bool italic() const; void setItalic(bool italic); bool underline() const; void setUnderline(bool underline); bool getIsRich() const; int fontSize() const; void setFontSize(int size); QString fileName() const; QString fileType() const; QUrl fileUrl() const; + void setFileUrl(const QUrl &url); inline QString text() const { return m_text; } void setText(const QString &text); bool getAutoReload() const; void setAutoReload(const bool &value); bool getModified() const; bool getExternallyModified() const; void setExternallyModified(const bool &value); QString formatName() const; void setFormatName(const QString &formatName); QColor getBackgroundColor() const; void setBackgroundColor(const QColor &color); Alerts *getAlerts() const; public slots: void load(const QUrl &fileUrl); void saveAs(const QUrl &fileUrl); static const QStringList getLanguageNameList(); static const QString getLanguageNameFromFileName(const QUrl &fileName); signals: void documentChanged(); void cursorPositionChanged(); void selectionStartChanged(); void selectionEndChanged(); void fontFamilyChanged(); void textColorChanged(); void alignmentChanged(); void boldChanged(); void uppercaseChanged(); void italicChanged(); void underlineChanged(); void isRichChanged(); void fontSizeChanged(); void textChanged(); void fileUrlChanged(); void loaded(const QUrl &url); void error(const QString &message); void loadFile(QUrl url); void autoReloadChanged(); void externallyModifiedChanged(); void backgroundColorChanged(); void formatNameChanged() const; + + void modifiedChanged(); private: void reset(); void setStyle(); QTextCursor textCursor() const; QTextDocument *textDocument() const; void mergeFormatOnWordOrSelection(const QTextCharFormat &format); QQuickTextDocument *m_document; QFileSystemWatcher *m_watcher; int m_cursorPosition; int m_selectionStart; int m_selectionEnd; bool isRich = false; QFont m_font; int m_fontSize; QUrl m_fileUrl; QThread m_worker; QString m_text; bool m_autoReload = false; bool m_externallyModified = false; bool m_internallyModified = false; QColor m_backgroundColor; static int m_instanceCount; QString m_formatName; static KSyntaxHighlighting::Repository *m_repository; KSyntaxHighlighting::SyntaxHighlighter *m_highlighter; Alerts *m_alerts; DocumentAlert * missingAlert(); DocumentAlert * externallyModifiedAlert(); DocumentAlert * canNotSaveAlert(const QString &details); }; #endif // DOCUMENTHANDLER_H