.
+ int idx = nextTag.m_style.indexOf(bgReg);
+ if (idx == -1) {
+ continue;
+ }
+
+ QString bgStyle = bgReg.cap(2);
+
+ pos = tagIdx;
+ idx = p_html.indexOf(m_styleTagReg, pos);
+ if (idx == -1 || idx != tagIdx) {
+ // without "style".
+ QString newTag = QString("<%1 style=\"%2\" %3>").arg(m_tagReg.cap(1))
+ .arg(bgStyle)
+ .arg(m_tagReg.cap(2));
+ p_html.replace(tagIdx, m_tagReg.matchedLength(), newTag);
+
+ pos = tagIdx + newTag.size();
+
+ altered = true;
+ continue;
+ }
+
+ QString newTag;
+ if (m_styleTagReg.cap(3).indexOf(bgReg) == -1) {
+ // No background style specified.
+ newTag = QString("<%1%2style=\"%3\"%4>").arg(m_styleTagReg.cap(1))
+ .arg(m_styleTagReg.cap(2))
+ .arg(m_styleTagReg.cap(3) + bgStyle)
+ .arg(m_styleTagReg.cap(4));
+ } else {
+ // Replace background style.
+ newTag = QString("<%1%2style=\"%3\"%4>").arg(m_styleTagReg.cap(1))
+ .arg(m_styleTagReg.cap(2))
+ .arg(m_styleTagReg.cap(3).replace(bgReg, " " + bgStyle))
+ .arg(m_styleTagReg.cap(4));
+ }
+
+ p_html.replace(idx, m_styleTagReg.matchedLength(), newTag);
+
+ pos = idx + newTag.size();
+
+ altered = true;
+ }
+
+ return altered;
+}
+
+VWebUtils::HtmlTag VWebUtils::readNextTag(const QString &p_html, int p_pos)
+{
+ HtmlTag tag;
+
+ int tagIdx = p_html.indexOf(m_tagReg, p_pos);
+ if (tagIdx == -1) {
+ return tag;
+ }
+
+ tag.m_name = m_tagReg.cap(1);
+ tag.m_start = tagIdx;
+ tag.m_end = skipToTagEnd(p_html, tagIdx + m_tagReg.matchedLength(), tag.m_name);
+
+ int idx = p_html.indexOf(m_styleTagReg, tagIdx);
+ if (idx == -1 || idx != tagIdx) {
+ return tag;
+ }
+
+ tag.m_style = m_styleTagReg.cap(3);
+ return tag;
+}
diff --git a/src/utils/vwebutils.h b/src/utils/vwebutils.h
index 289e7680..e66c89a1 100644
--- a/src/utils/vwebutils.h
+++ b/src/utils/vwebutils.h
@@ -3,22 +3,114 @@
#include
#include
+#include
+#include
+#include
class VWebUtils
{
public:
- // Fix ![]()
in @p_html.
- static bool fixImageSrcInHtml(const QUrl &p_baseUrl, QString &p_html);
+ VWebUtils();
- // Remove background color style in @p_html.
- static bool removeBackgroundColor(QString &p_html);
+ void init();
- // Translate color styles in @p_html using mappings from VPalette.
- static bool translateColors(QString &p_html);
+ QStringList getCopyTargetsName() const;
+
+ // Alter @p_html using @p_target.
+ // Returns true if @p_html is modified.
+ bool alterHtmlAsTarget(const QUrl &p_baseUrl, QString &p_html, const QString &p_target) const;
private:
- VWebUtils();
-};
+ struct CopyTargetAction
+ {
+ QChar m_act;
+ QStringList m_args;
+ };
+
+ struct CopyTarget
+ {
+ QString m_name;
+
+ QVector m_actions;
+ };
+
+ struct HtmlTag
+ {
+ HtmlTag()
+ : m_start(-1), m_end(-1)
+ {
+
+ }
+
+ bool isNull()
+ {
+ return m_name.isEmpty();
+ }
+
+ QString m_name;
+ QString m_style;
+
+ int m_start;
+ int m_end;
+ };
+
+ void initCopyTargets(const QStringList &p_str);
+
+ // Return the index in m_copyTargets of @p_target.
+ int targetIndex(const QString &p_target) const;
+
+ bool alterHtmlByTargetAction(const QUrl &p_baseUrl, QString &p_html, const CopyTargetAction &p_action);
+
+ // Remove background color style in @p_html of all tags except @p_skipTags.
+ bool removeBackgroundColor(QString &p_html, const QStringList &p_skipTags);
+
+ // Translate color styles in @p_html using mappings from VPalette.
+ bool translateColors(QString &p_html, const QStringList &p_skipTags);
+
+ // Fix ![]()
in @p_html.
+ bool fixImageSrc(const QUrl &p_baseUrl, QString &p_html);
+
+ // Remove margin/padding/margin-left/right/padding-left/right.
+ bool removeMarginPadding(QString &p_html, const QStringList &p_skipTags);
+
+ bool removeStyles(QString &p_html, const QStringList &p_skipTags, const QStringList &p_styles);
+
+ // Remove styles specified in [web]/styles_to_remove_when_copied.
+ bool removeStylesToRemoveWhenCopied(QString &p_html, const QStringList &p_skipTags);
+
+ // Remove all styles.
+ bool removeAllStyles(QString &p_html, const QStringList &p_skipTags);
+
+ // Transform to .
+ bool transformMarkToSpan(QString &p_html);
+
+ // Replace the background color of with that of its child .
+ bool replacePreBackgroundColorWithCode(QString &p_html);
+
+ VWebUtils::HtmlTag readNextTag(const QString &p_html, int p_pos);
+
+ QVector m_copyTargets;
+
+ // Custom styles to remove when copied.
+ QStringList m_stylesToRemoveWhenCopied;
+
+ // Style of which is transformed from .
+ QString m_styleOfSpanForMark;
+
+ // Html start tag.
+ // Captured texts:
+ // 1. The tag name like 'code';
+ // 2. Text after tag name and before the end '>';
+ QRegExp m_tagReg;
+
+ // Html start tag with "style" defined.
+ // Captured texts:
+ // 1. The tag name like 'code';
+ // 2. Text before 'style=""';
+ // 3. Text inside 'style=""';
+ // 4. Text after 'style=""' and before '>';
+ QRegExp m_styleTagReg;
+};
#endif // VWEBUTILS_H
diff --git a/src/vconfigmanager.cpp b/src/vconfigmanager.cpp
index 0e6956c9..7dd44d84 100644
--- a/src/vconfigmanager.cpp
+++ b/src/vconfigmanager.cpp
@@ -285,12 +285,6 @@ void VConfigManager::initialize()
m_closeBeforeExternalEditor = getConfigFromSettings("global",
"close_before_external_editor").toBool();
- m_fixImageSrcInWebWhenCopied = getConfigFromSettings("web",
- "fix_img_src_when_copied").toBool();
-
- m_stylesToRemoveWhenCopied = getConfigFromSettings("web",
- "styles_to_remove_when_copied").toStringList();
-
m_stylesToInlineWhenCopied = getConfigFromSettings("web",
"styles_to_inline_when_copied").toStringList().join(",");
}
diff --git a/src/vconfigmanager.h b/src/vconfigmanager.h
index cb1a7b80..40a3cb84 100644
--- a/src/vconfigmanager.h
+++ b/src/vconfigmanager.h
@@ -426,12 +426,15 @@ public:
bool getCloseBeforeExternalEditor() const;
- bool getFixImageSrcInWebWhenCopied() const;
-
- const QStringList &getStylesToRemoveWhenCopied() const;
+ QStringList getStylesToRemoveWhenCopied() const;
const QString &getStylesToInlineWhenCopied() const;
+ QString getStyleOfSpanForMark() const;
+
+ // Return [web]/copy_targets.
+ QStringList getCopyTargets() const;
+
private:
// Look up a config from user and default settings.
QVariant getConfigFromSettings(const QString §ion, const QString &key) const;
@@ -822,12 +825,6 @@ private:
// Whether user has reset the configurations.
bool m_hasReset;
- // Whether fix the local relative image src in read mode when copied.
- bool m_fixImageSrcInWebWhenCopied;
-
- // Styles to be removed when copied in read mode.
- QStringList m_stylesToRemoveWhenCopied;
-
// The string containing styles to inline when copied in edit mode.
QString m_stylesToInlineWhenCopied;
@@ -1998,18 +1995,27 @@ inline bool VConfigManager::getCloseBeforeExternalEditor() const
return m_closeBeforeExternalEditor;
}
-inline bool VConfigManager::getFixImageSrcInWebWhenCopied() const
+inline QStringList VConfigManager::getStylesToRemoveWhenCopied() const
{
- return m_fixImageSrcInWebWhenCopied;
-}
+ return getConfigFromSettings("web",
+ "styles_to_remove_when_copied").toStringList();
-inline const QStringList &VConfigManager::getStylesToRemoveWhenCopied() const
-{
- return m_stylesToRemoveWhenCopied;
}
inline const QString &VConfigManager::getStylesToInlineWhenCopied() const
{
return m_stylesToInlineWhenCopied;
}
+
+inline QStringList VConfigManager::getCopyTargets() const
+{
+ return getConfigFromSettings("web",
+ "copy_targets").toStringList();
+}
+
+inline QString VConfigManager::getStyleOfSpanForMark() const
+{
+ return getConfigFromSettings("web",
+ "style_of_span_for_mark").toString();
+}
#endif // VCONFIGMANAGER_H
diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp
index eabd386e..158af2b3 100644
--- a/src/vmainwindow.cpp
+++ b/src/vmainwindow.cpp
@@ -36,14 +36,16 @@
#include "utils/viconutils.h"
#include "dialog/vtipsdialog.h"
-VMainWindow *g_mainWin;
-
extern VConfigManager *g_config;
extern VPalette *g_palette;
+VMainWindow *g_mainWin;
+
VNote *g_vnote;
+VWebUtils *g_webUtils;
+
const int VMainWindow::c_sharedMemTimerInterval = 1000;
#if defined(QT_NO_DEBUG)
@@ -62,9 +64,13 @@ VMainWindow::VMainWindow(VSingleInstanceGuard *p_guard, QWidget *p_parent)
g_mainWin = this;
setWindowIcon(QIcon(":/resources/icons/vnote.ico"));
+
vnote = new VNote(this);
g_vnote = vnote;
+ m_webUtils.init();
+ g_webUtils = &m_webUtils;
+
if (g_config->getEnableCompactMode()) {
m_panelViewState = PanelViewState::CompactMode;
} else {
diff --git a/src/vmainwindow.h b/src/vmainwindow.h
index 990a6c98..5a33cfb5 100644
--- a/src/vmainwindow.h
+++ b/src/vmainwindow.h
@@ -8,6 +8,7 @@
#include
#include "vfile.h"
#include "vedittab.h"
+#include "utils/vwebutils.h"
class QLabel;
class QComboBox;
@@ -376,6 +377,8 @@ private:
// Whether user request VNote to quit.
bool m_requestQuit;
+ VWebUtils m_webUtils;
+
// Interval of the shared memory timer in ms.
static const int c_sharedMemTimerInterval;
};
diff --git a/src/vmdeditor.cpp b/src/vmdeditor.cpp
index 338e6e51..318c6386 100644
--- a/src/vmdeditor.cpp
+++ b/src/vmdeditor.cpp
@@ -20,6 +20,9 @@
#include "vpreviewmanager.h"
#include "utils/viconutils.h"
#include "dialog/vcopytextashtmldialog.h"
+#include "utils/vwebutils.h"
+
+extern VWebUtils *g_webUtils;
extern VConfigManager *g_config;
@@ -275,12 +278,7 @@ void VMdEditor::contextMenuEvent(QContextMenuEvent *p_event)
const QList actions = menu->actions();
if (textCursor().hasSelection()) {
- QAction *copyAsHtmlAct = new QAction(tr("Copy As &HTML without Background"), menu);
- copyAsHtmlAct->setToolTip(tr("Copy selected contents as HTML without background styles"));
- connect(copyAsHtmlAct, &QAction::triggered,
- this, &VMdEditor::handleCopyAsHtmlAction);
-
- menu->insertAction(actions.isEmpty() ? NULL : actions[0], copyAsHtmlAct);
+ initCopyAsMenu(actions.isEmpty() ? NULL : actions.last(), menu);
} else {
QAction *saveExitAct = new QAction(VIconUtils::menuIcon(":/resources/icons/save_exit.svg"),
tr("&Save Changes And Read"),
@@ -1042,7 +1040,7 @@ void VMdEditor::updateInitAndInsertedImages(bool p_fileChanged, UpdateAction p_a
}
}
-void VMdEditor::handleCopyAsHtmlAction()
+void VMdEditor::handleCopyAsAction(QAction *p_act)
{
QTextCursor cursor = textCursor();
Q_ASSERT(cursor.hasSelection());
@@ -1051,7 +1049,7 @@ void VMdEditor::handleCopyAsHtmlAction()
Q_ASSERT(!text.isEmpty());
Q_ASSERT(!m_textToHtmlDialog);
- m_textToHtmlDialog = new VCopyTextAsHtmlDialog(text, this);
+ m_textToHtmlDialog = new VCopyTextAsHtmlDialog(text, p_act->data().toString(), this);
// For Hoedown, we use marked.js to convert the text to have a general interface.
emit requestTextToHtml(text);
@@ -1129,3 +1127,31 @@ void VMdEditor::zoomPage(bool p_zoomIn, int p_range)
m_mdHighlighter->rehighlight();
}
+
+void VMdEditor::initCopyAsMenu(QAction *p_before, QMenu *p_menu)
+{
+ QStringList targets = g_webUtils->getCopyTargetsName();
+ if (targets.isEmpty()) {
+ return;
+ }
+
+ QMenu *subMenu = new QMenu(tr("Copy HTML As"), p_menu);
+ subMenu->setToolTipsVisible(true);
+ for (auto const & target : targets) {
+ QAction *act = new QAction(target, subMenu);
+ act->setData(target);
+ act->setToolTip(tr("Copy selected content as HTML using rules specified by target %1").arg(target));
+
+ subMenu->addAction(act);
+ }
+
+ connect(subMenu, &QMenu::triggered,
+ this, &VMdEditor::handleCopyAsAction);
+
+ QAction *menuAct = p_menu->insertMenu(p_before, subMenu);
+ if (p_before) {
+ p_menu->removeAction(p_before);
+ p_menu->insertAction(menuAct, p_before);
+ p_menu->insertSeparator(menuAct);
+ }
+}
diff --git a/src/vmdeditor.h b/src/vmdeditor.h
index 76428bc1..fbac42d2 100644
--- a/src/vmdeditor.h
+++ b/src/vmdeditor.h
@@ -211,7 +211,7 @@ private slots:
void updateCurrentHeader();
// Copy selected text as HTML.
- void handleCopyAsHtmlAction();
+ void handleCopyAsAction(QAction *p_act);
private:
// Update the config of VTextEdit according to global configurations.
@@ -232,6 +232,8 @@ private:
// We need to maintain the styles font size.
void zoomPage(bool p_zoomIn, int p_range = 1);
+ void initCopyAsMenu(QAction *p_before, QMenu *p_menu);
+
HGMarkdownHighlighter *m_mdHighlighter;
VCodeBlockHighlightHelper *m_cbHighlighter;
diff --git a/src/vwebview.cpp b/src/vwebview.cpp
index f047be56..3be1df13 100644
--- a/src/vwebview.cpp
+++ b/src/vwebview.cpp
@@ -19,6 +19,8 @@
extern VConfigManager *g_config;
+extern VWebUtils *g_webUtils;
+
// We set the property of the clipboard to mark that the URL copied in the
// clipboard has been altered.
static const QString c_ClipboardPropertyMark = "CopiedImageURLAltered";
@@ -27,8 +29,6 @@ VWebView::VWebView(VFile *p_file, QWidget *p_parent)
: QWebEngineView(p_parent),
m_file(p_file),
m_copyImageUrlActionHooked(false),
- m_needRemoveBackground(false),
- m_fixImgSrc(g_config->getFixImageSrcInWebWhenCopied()),
m_afterCopyImage(false)
{
setAcceptDrops(false);
@@ -75,16 +75,10 @@ void VWebView::contextMenuEvent(QContextMenuEvent *p_event)
}
}
- // Add Copy without Background action.
+ // Add Copy As menu.
QAction *copyAct = pageAction(QWebEnginePage::Copy);
if (actions.contains(copyAct)) {
- QAction *copyWithoutBgAct = new QAction(tr("Copy &without Background"), menu);
- copyWithoutBgAct->setToolTip(tr("Copy selected content without background styles"));
- connect(copyWithoutBgAct, &QAction::triggered,
- this, &VWebView::handleCopyWithoutBackgroundAction);
- menu->insertAction(copyAct, copyWithoutBgAct);
- menu->removeAction(copyAct);
- menu->insertAction(copyWithoutBgAct, copyAct);
+ initCopyAsMenu(copyAct, menu);
}
// We need to replace the "Copy Image" action:
@@ -101,14 +95,8 @@ void VWebView::contextMenuEvent(QContextMenuEvent *p_event)
defaultCopyImageAct->setVisible(false);
}
- // Add Copy All without Background action.
- QAction *copyAllWithoutBgAct = new QAction(tr("Copy &All without Background"), menu);
- copyAllWithoutBgAct->setToolTip(tr("Copy all contents without background styles"));
- connect(copyAllWithoutBgAct, &QAction::triggered,
- this, &VWebView::handleCopyAllWithoutBackgroundAction);
- // Add it to the back.
- menu->addSeparator();
- menu->addAction(copyAllWithoutBgAct);
+ // Add Copy All As menu.
+ initCopyAllAsMenu(menu);
hideUnusedActions(menu);
@@ -267,27 +255,10 @@ bool VWebView::removeStyles(QString &p_html)
return changed;
}
-void VWebView::handleCopyWithoutBackgroundAction()
-{
- m_needRemoveBackground = true;
-
- triggerPageAction(QWebEnginePage::Copy);
-}
-
-void VWebView::handleCopyAllWithoutBackgroundAction()
-{
- triggerPageAction(QWebEnginePage::SelectAll);
-
- m_needRemoveBackground = true;
- triggerPageAction(QWebEnginePage::Copy);
-
- triggerPageAction(QWebEnginePage::Unselect);
-}
-
void VWebView::handleClipboardChanged(QClipboard::Mode p_mode)
{
- bool removeBackground = m_needRemoveBackground;
- m_needRemoveBackground = false;
+ QString copyTarget = m_copyTarget;
+ m_copyTarget.clear();
bool afterCopyImage = m_afterCopyImage;
m_afterCopyImage = false;
@@ -306,49 +277,22 @@ void VWebView::handleClipboardChanged(QClipboard::Mode p_mode)
if (afterCopyImage) {
removeHtmlFromImageData(clipboard, mimeData);
} else {
- alterHtmlMimeData(clipboard, mimeData, removeBackground);
+ alterHtmlMimeData(clipboard, mimeData, copyTarget);
}
}
void VWebView::alterHtmlMimeData(QClipboard *p_clipboard,
const QMimeData *p_mimeData,
- bool p_removeBackground)
+ const QString &p_copyTarget)
{
- if (!p_mimeData->hasHtml() || p_mimeData->hasImage()) {
+ if (!p_mimeData->hasHtml()
+ || p_mimeData->hasImage()
+ || p_copyTarget.isEmpty()) {
return;
}
- bool altered = false;
QString html = p_mimeData->html();
-
- // Add surrounded tags.
- if (!html.startsWith("")) {
- altered = true;
- html = QString("%1").arg(html);
- }
-
- // Remove background color.
- if (p_removeBackground) {
- if (VWebUtils::removeBackgroundColor(html)) {
- altered = true;
- }
-
- if (VWebUtils::translateColors(html)) {
- altered = true;
- }
- }
-
- // Fix local relative images.
- if (m_fixImgSrc && VWebUtils::fixImageSrcInHtml(url(), html)) {
- altered = true;
- }
-
- // Fix margin and padding.
- if (removeStyles(html)) {
- altered = true;
- }
-
- if (!altered) {
+ if (!g_webUtils->alterHtmlAsTarget(url(), html, p_copyTarget)) {
return;
}
@@ -374,3 +318,79 @@ void VWebView::removeHtmlFromImageData(QClipboard *p_clipboard,
VClipboardUtils::setMimeDataToClipboard(p_clipboard, data, QClipboard::Clipboard);
}
}
+
+void VWebView::initCopyAsMenu(QAction *p_after, QMenu *p_menu)
+{
+ QStringList targets = g_webUtils->getCopyTargetsName();
+ if (targets.isEmpty()) {
+ return;
+ }
+
+ QMenu *subMenu = new QMenu(tr("Copy As"), p_menu);
+ subMenu->setToolTipsVisible(true);
+ for (auto const & target : targets) {
+ QAction *act = new QAction(target, subMenu);
+ act->setData(target);
+ act->setToolTip(tr("Copy selected content using rules specified by target %1").arg(target));
+
+ subMenu->addAction(act);
+ }
+
+ connect(subMenu, &QMenu::triggered,
+ this, &VWebView::handleCopyAsAction);
+
+ QAction *menuAct = p_menu->insertMenu(p_after, subMenu);
+ p_menu->removeAction(p_after);
+ p_menu->insertAction(menuAct, p_after);
+}
+
+void VWebView::handleCopyAsAction(QAction *p_act)
+{
+ if (!p_act) {
+ return;
+ }
+
+ m_copyTarget = p_act->data().toString();
+
+ triggerPageAction(QWebEnginePage::Copy);
+}
+
+void VWebView::initCopyAllAsMenu(QMenu *p_menu)
+{
+ QStringList targets = g_webUtils->getCopyTargetsName();
+ if (targets.isEmpty()) {
+ return;
+ }
+
+ QMenu *subMenu = new QMenu(tr("Copy All As"), p_menu);
+ subMenu->setToolTipsVisible(true);
+ for (auto const & target : targets) {
+ QAction *act = new QAction(target, subMenu);
+ act->setData(target);
+ act->setToolTip(tr("Copy all content using rules specified by target %1").arg(target));
+
+ subMenu->addAction(act);
+ }
+
+ connect(subMenu, &QMenu::triggered,
+ this, &VWebView::handleCopyAllAsAction);
+
+ p_menu->addSeparator();
+ p_menu->addMenu(subMenu);
+}
+
+void VWebView::handleCopyAllAsAction(QAction *p_act)
+{
+ if (!p_act) {
+ return;
+ }
+
+ triggerPageAction(QWebEnginePage::SelectAll);
+
+ m_copyTarget = p_act->data().toString();
+
+ triggerPageAction(QWebEnginePage::Copy);
+
+ triggerPageAction(QWebEnginePage::Unselect);
+}
+
diff --git a/src/vwebview.h b/src/vwebview.h
index 453e912f..2db5b046 100644
--- a/src/vwebview.h
+++ b/src/vwebview.h
@@ -26,9 +26,9 @@ private slots:
void handleCopyImageUrlAction();
- void handleCopyWithoutBackgroundAction();
+ void handleCopyAsAction(QAction *p_act);
- void handleCopyAllWithoutBackgroundAction();
+ void handleCopyAllAsAction(QAction *p_act);
// Copy the clicked image.
// Used to replace the default CopyImageToClipboard action.
@@ -41,24 +41,27 @@ private:
void alterHtmlMimeData(QClipboard *p_clipboard,
const QMimeData *p_mimeData,
- bool p_removeBackground);
+ const QString &p_copyTarget);
void removeHtmlFromImageData(QClipboard *p_clipboard,
const QMimeData *p_mimeData);
bool removeStyles(QString &p_html);
+ void initCopyAsMenu(QAction *p_after, QMenu *p_menu);
+
+ void initCopyAllAsMenu(QMenu *p_menu);
+
VFile *m_file;
// Whether this view has hooked the Copy Image Url action.
bool m_copyImageUrlActionHooked;
- bool m_needRemoveBackground;
-
- bool m_fixImgSrc;
-
// Whether it is after copy image action.
bool m_afterCopyImage;
+
+ // Target of Copy As.
+ QString m_copyTarget;
};
#endif // VWEBVIEW_H