mirror of
https://gitee.com/vnotex/vnote.git
synced 2025-07-05 05:49:53 +08:00
export: allow local file remote access
This commit is contained in:
parent
b0b51570b0
commit
85d2ee950d
@ -6,6 +6,7 @@
|
|||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QMimeData>
|
#include <QMimeData>
|
||||||
#include <QScopedPointer>
|
#include <QScopedPointer>
|
||||||
|
#include <QWebEngineSettings>
|
||||||
|
|
||||||
#include "markdownvieweradapter.h"
|
#include "markdownvieweradapter.h"
|
||||||
#include "previewhelper.h"
|
#include "previewhelper.h"
|
||||||
@ -70,6 +71,8 @@ MarkdownViewer::MarkdownViewer(MarkdownViewerAdapter *p_adapter,
|
|||||||
mimeData->setHtml(p_html);
|
mimeData->setHtml(p_html);
|
||||||
ClipboardUtils::setMimeDataToClipboard(QApplication::clipboard(), mimeData.release());
|
ClipboardUtils::setMimeDataToClipboard(QApplication::clipboard(), mimeData.release());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
MarkdownViewerAdapter *MarkdownViewer::adapter() const
|
MarkdownViewerAdapter *MarkdownViewer::adapter() const
|
||||||
|
@ -508,8 +508,6 @@ void MarkdownViewWindow::setupViewer()
|
|||||||
setEditViewMode(m_editViewMode);
|
setEditViewMode(m_editViewMode);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
m_viewer->settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MarkdownViewWindow::syncTextEditorFromBuffer(bool p_syncPositionFromReadMode)
|
void MarkdownViewWindow::syncTextEditorFromBuffer(bool p_syncPositionFromReadMode)
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
#include "webpage.h"
|
#include "webpage.h"
|
||||||
|
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
#include <utils/widgetutils.h>
|
#include <utils/widgetutils.h>
|
||||||
#include <core/vnotex.h>
|
#include <core/vnotex.h>
|
||||||
#include <core/fileopenparameters.h>
|
#include <core/fileopenparameters.h>
|
||||||
@ -35,3 +37,14 @@ bool WebPage::acceptNavigationRequest(const QUrl &p_url,
|
|||||||
WidgetUtils::openUrlByDesktop(p_url);
|
WidgetUtils::openUrlByDesktop(p_url);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WebPage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level,
|
||||||
|
const QString &message,
|
||||||
|
int lineNumber,
|
||||||
|
const QString &sourceID)
|
||||||
|
{
|
||||||
|
if (level == QWebEnginePage::InfoMessageLevel) {
|
||||||
|
qDebug() << "JS(" << sourceID << ":" << lineNumber << "):" << message;
|
||||||
|
}
|
||||||
|
QWebEnginePage::javaScriptConsoleMessage(level, message, lineNumber, sourceID);
|
||||||
|
}
|
||||||
|
@ -15,6 +15,11 @@ namespace vnotex
|
|||||||
bool acceptNavigationRequest(const QUrl &p_url,
|
bool acceptNavigationRequest(const QUrl &p_url,
|
||||||
NavigationType p_type,
|
NavigationType p_type,
|
||||||
bool p_isMainFrame) Q_DECL_OVERRIDE;
|
bool p_isMainFrame) Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
|
void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level,
|
||||||
|
const QString &message,
|
||||||
|
int lineNumber,
|
||||||
|
const QString &sourceID) override;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user