dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

translate path from native separtor to /

Browse Source
This commit is contained in:
Le Tan 2018-11-02 19:54:14 +08:00
parent 6455e9ca19
commit ee6059ff7c
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dialog/vorphanfileinfodialog.cpp
View File

@ -58,7 +58,7 @@ void VOrphanFileInfoDialog::setupUI()
QString VOrphanFileInfoDialog::getImageFolder() const QString VOrphanFileInfoDialog::getImageFolder() const
{ {
return m_imageFolderEdit->text(); return QDir::fromNativeSeparators(m_imageFolderEdit->text());
} }
void VOrphanFileInfoDialog::handleInputChanged() void VOrphanFileInfoDialog::handleInputChanged()

2
src/dialog/vsettingsdialog.cpp
View File

@ -1080,7 +1080,7 @@ bool VNoteManagementTab::loadImageFolderExt()
bool VNoteManagementTab::saveImageFolderExt() bool VNoteManagementTab::saveImageFolderExt()
{ {
if (m_customImageFolderExt->isChecked()) { if (m_customImageFolderExt->isChecked()) {
g_config->setImageFolderExt(m_imageFolderEditExt->text()); g_config->setImageFolderExt(QDir::fromNativeSeparators(m_imageFolderEditExt->text()));
} else { } else {
g_config->setImageFolderExt(""); g_config->setImageFolderExt("");
} }

9
src/vmdeditoperations.cpp
View File

@ -113,8 +113,7 @@ void VMdEditOperations::insertImageFromQImage(const QString &p_title,
return; 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)); insertText(imageLink(p_title, url, p_width, p_height));
qDebug() << "insert image" << p_title << filePath; qDebug() << "insert image" << p_title << filePath;
@ -195,7 +194,7 @@ void VMdEditOperations::insertImageFromPath(const QString &p_title,
return; 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; p_destImagePath = filePath;
if (p_insertText) { if (p_insertText) {
@ -1199,7 +1198,7 @@ void VMdEditOperations::decorateStrikethrough()
bool VMdEditOperations::insertLink(const QString &p_linkText, bool VMdEditOperations::insertLink(const QString &p_linkText,
const QString &p_linkUrl) 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); insertText(link);
setVimMode(VimMode::Insert); setVimMode(VimMode::Insert);
@ -1211,7 +1210,7 @@ bool VMdEditOperations::insertImageLink(const QString &p_linkText,
const QString &p_linkUrl) const QString &p_linkUrl)
{ {
QTextCursor cursor = m_editor->textCursorW(); 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); m_editor->setTextCursorW(cursor);
setVimMode(VimMode::Insert); setVimMode(VimMode::Insert);