From 6aa0e989934a3398c93686bdea6e64a02a6ecb0e Mon Sep 17 00:00:00 2001 From: Le Tan Date: Sat, 19 Dec 2020 12:58:41 +0800 Subject: [PATCH] small fix --- .github/workflows/ci-macos.yml | 1 - src/core/clipboarddata.cpp | 2 +- src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp | 2 +- src/widgets/dialogs/legacynotebookutils.cpp | 6 +++--- src/widgets/editors/markdowneditor.cpp | 8 +++++++- src/widgets/editors/markdowneditor.h | 2 ++ 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 8fb04070..90537a51 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -90,7 +90,6 @@ jobs: - name: Mac Deploy run: | pushd src - sed -i -e 's/com.yourcompany.vnote/com.vnotex.vnote/g' vnote.app/Contents/Info.plist macdeployqt vnote.app python ${{runner.workspace}}/macdeployqtfix/macdeployqtfix.py vnote.app/Contents/MacOS/vnote $Qt5_Dir # Fix Helpers/QtWebEngineProcess.app diff --git a/src/core/clipboarddata.cpp b/src/core/clipboarddata.cpp index 17eff270..254fc271 100644 --- a/src/core/clipboarddata.cpp +++ b/src/core/clipboarddata.cpp @@ -84,7 +84,7 @@ void ClipboardData::fromJson(const QJsonObject &p_jobj) } const auto itemArr = p_jobj[c_data].toArray(); - for (size_t i = 0; i < itemArr.size(); ++i) { + for (int i = 0; i < itemArr.size(); ++i) { auto dataItem = createClipboardDataItem(m_action); dataItem->fromJson(itemArr[i].toObject()); m_data.push_back(dataItem); diff --git a/src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp b/src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp index 0383e0fb..66be042e 100644 --- a/src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp +++ b/src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp @@ -71,7 +71,7 @@ void VXNotebookConfigMgr::NodeFileConfig::fromJson(const QJsonObject &p_jobj) { auto arr = p_jobj[NodeConfig::c_tags].toArray(); - for (size_t i = 0; i < arr.size(); ++i) { + for (int i = 0; i < arr.size(); ++i) { m_tags << arr[i].toString(); } } diff --git a/src/widgets/dialogs/legacynotebookutils.cpp b/src/widgets/dialogs/legacynotebookutils.cpp index b9687218..1dbc6434 100644 --- a/src/widgets/dialogs/legacynotebookutils.cpp +++ b/src/widgets/dialogs/legacynotebookutils.cpp @@ -65,7 +65,7 @@ void LegacyNotebookUtils::removeFolderConfigFile(const QString &p_folderPath) void LegacyNotebookUtils::forEachFolder(const QJsonObject &p_config, std::function p_func) { auto folderArray = p_config.value(QStringLiteral("sub_directories")).toArray(); - for (size_t i = 0; i < folderArray.size(); ++i) { + for (int i = 0; i < folderArray.size(); ++i) { const auto name = folderArray[i].toObject().value(QStringLiteral("name")).toString(); p_func(name); } @@ -74,7 +74,7 @@ void LegacyNotebookUtils::forEachFolder(const QJsonObject &p_config, std::functi void LegacyNotebookUtils::forEachFile(const QJsonObject &p_config, std::function p_func) { auto fileArray = p_config.value(QStringLiteral("files")).toArray(); - for (size_t i = 0; i < fileArray.size(); ++i) { + for (int i = 0; i < fileArray.size(); ++i) { const auto obj = fileArray[i].toObject(); FileInfo info; info.m_name = obj.value(QStringLiteral("name")).toString(); @@ -89,7 +89,7 @@ void LegacyNotebookUtils::forEachFile(const QJsonObject &p_config, std::function info.m_attachmentFolder = obj.value(QStringLiteral("attachment_folder")).toString(); { auto arr = obj.value(QStringLiteral("tags")).toArray(); - for (size_t i = 0; i < arr.size(); ++i) { + for (int i = 0; i < arr.size(); ++i) { info.m_tags << arr[i].toString(); } } diff --git a/src/widgets/editors/markdowneditor.cpp b/src/widgets/editors/markdowneditor.cpp index 148e8b29..51724db1 100644 --- a/src/widgets/editors/markdowneditor.cpp +++ b/src/widgets/editors/markdowneditor.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -74,8 +75,13 @@ MarkdownEditor::MarkdownEditor(const MarkdownEditorConfig &p_config, // TODO: insert heading sequence. updateHeadings(p_headerRegions); }); - connect(m_textEdit, &vte::VTextEdit::cursorLineChanged, + + m_headingTimer = new QTimer(this); + m_headingTimer->setInterval(500); + connect(m_headingTimer, &QTimer::timeout, this, &MarkdownEditor::currentHeadingChanged); + connect(m_textEdit, &vte::VTextEdit::cursorLineChanged, + m_headingTimer, QOverload::of(&QTimer::start)); } MarkdownEditor::~MarkdownEditor() diff --git a/src/widgets/editors/markdowneditor.h b/src/widgets/editors/markdowneditor.h index 566a94e9..e30d521b 100644 --- a/src/widgets/editors/markdowneditor.h +++ b/src/widgets/editors/markdowneditor.h @@ -163,6 +163,8 @@ namespace vnotex // TimeStamp used as sequence number to interact with Web side. TimeStamp m_timeStamp = 0; + + QTimer *m_headingTimer = nullptr; }; }