From ee6059ff7c9f9ec56baac510475cdfc3c436b3f7 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Fri, 2 Nov 2018 19:54:14 +0800 Subject: [PATCH] translate path from native separtor to / --- src/dialog/vorphanfileinfodialog.cpp | 2 +- src/dialog/vsettingsdialog.cpp | 2 +- src/vmdeditoperations.cpp | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/dialog/vorphanfileinfodialog.cpp b/src/dialog/vorphanfileinfodialog.cpp index 435b0291..4d9c26c5 100644 --- a/src/dialog/vorphanfileinfodialog.cpp +++ b/src/dialog/vorphanfileinfodialog.cpp @@ -58,7 +58,7 @@ void VOrphanFileInfoDialog::setupUI() QString VOrphanFileInfoDialog::getImageFolder() const { - return m_imageFolderEdit->text(); + return QDir::fromNativeSeparators(m_imageFolderEdit->text()); } void VOrphanFileInfoDialog::handleInputChanged() diff --git a/src/dialog/vsettingsdialog.cpp b/src/dialog/vsettingsdialog.cpp index 4524e3f2..b499d7d4 100644 --- a/src/dialog/vsettingsdialog.cpp +++ b/src/dialog/vsettingsdialog.cpp @@ -1080,7 +1080,7 @@ bool VNoteManagementTab::loadImageFolderExt() bool VNoteManagementTab::saveImageFolderExt() { if (m_customImageFolderExt->isChecked()) { - g_config->setImageFolderExt(m_imageFolderEditExt->text()); + g_config->setImageFolderExt(QDir::fromNativeSeparators(m_imageFolderEditExt->text())); } else { g_config->setImageFolderExt(""); } diff --git a/src/vmdeditoperations.cpp b/src/vmdeditoperations.cpp index 0a8cd6e7..c83b6ee8 100644 --- a/src/vmdeditoperations.cpp +++ b/src/vmdeditoperations.cpp @@ -113,8 +113,7 @@ void VMdEditOperations::insertImageFromQImage(const QString &p_title, return; } - QString url = QString("%1/%2").arg(p_folderInLink).arg(fileName); - + QString url = QDir::fromNativeSeparators(QString("%1/%2").arg(p_folderInLink).arg(fileName)); insertText(imageLink(p_title, url, p_width, p_height)); qDebug() << "insert image" << p_title << filePath; @@ -195,7 +194,7 @@ void VMdEditOperations::insertImageFromPath(const QString &p_title, return; } - p_urlInLink = QString("%1/%2").arg(p_folderInLink).arg(fileName); + p_urlInLink = QDir::fromNativeSeparators(QString("%1/%2").arg(p_folderInLink).arg(fileName)); p_destImagePath = filePath; if (p_insertText) { @@ -1199,7 +1198,7 @@ void VMdEditOperations::decorateStrikethrough() bool VMdEditOperations::insertLink(const QString &p_linkText, const QString &p_linkUrl) { - QString link = QString("[%1](%2)").arg(p_linkText).arg(p_linkUrl); + QString link = QString("[%1](%2)").arg(p_linkText).arg(QDir::fromNativeSeparators(p_linkUrl)); insertText(link); setVimMode(VimMode::Insert); @@ -1211,7 +1210,7 @@ bool VMdEditOperations::insertImageLink(const QString &p_linkText, const QString &p_linkUrl) { QTextCursor cursor = m_editor->textCursorW(); - cursor.insertText(imageLink(p_linkText, p_linkUrl)); + cursor.insertText(imageLink(p_linkText, QDir::fromNativeSeparators(p_linkUrl))); m_editor->setTextCursorW(cursor); setVimMode(VimMode::Insert);