Move preview context menu functionality to NotePreviewWidget for #800

pbek · Jun 22, 2019 · 390475b · 390475b
1 parent 376ed98
commit 390475b
Show file tree

Hide file tree

Showing 42 changed files with 6,688 additions and 6,430 deletions.
diff --git a/src/languages/QOwnNotes_ar.ts b/src/languages/QOwnNotes_ar.ts
diff --git a/src/languages/QOwnNotes_bn.ts b/src/languages/QOwnNotes_bn.ts
diff --git a/src/languages/QOwnNotes_ca.ts b/src/languages/QOwnNotes_ca.ts
diff --git a/src/languages/QOwnNotes_ceb.ts b/src/languages/QOwnNotes_ceb.ts
diff --git a/src/languages/QOwnNotes_cs.ts b/src/languages/QOwnNotes_cs.ts
diff --git a/src/languages/QOwnNotes_da.ts b/src/languages/QOwnNotes_da.ts
diff --git a/src/languages/QOwnNotes_de.ts b/src/languages/QOwnNotes_de.ts
diff --git a/src/languages/QOwnNotes_el.ts b/src/languages/QOwnNotes_el.ts
diff --git a/src/languages/QOwnNotes_en.ts b/src/languages/QOwnNotes_en.ts
diff --git a/src/languages/QOwnNotes_es.ts b/src/languages/QOwnNotes_es.ts
diff --git a/src/languages/QOwnNotes_fi.ts b/src/languages/QOwnNotes_fi.ts
diff --git a/src/languages/QOwnNotes_fil.ts b/src/languages/QOwnNotes_fil.ts
diff --git a/src/languages/QOwnNotes_fr.ts b/src/languages/QOwnNotes_fr.ts
diff --git a/src/languages/QOwnNotes_gl.ts b/src/languages/QOwnNotes_gl.ts
diff --git a/src/languages/QOwnNotes_hi.ts b/src/languages/QOwnNotes_hi.ts
diff --git a/src/languages/QOwnNotes_hil.ts b/src/languages/QOwnNotes_hil.ts
diff --git a/src/languages/QOwnNotes_hr.ts b/src/languages/QOwnNotes_hr.ts
diff --git a/src/languages/QOwnNotes_hu.ts b/src/languages/QOwnNotes_hu.ts
diff --git a/src/languages/QOwnNotes_id.ts b/src/languages/QOwnNotes_id.ts
diff --git a/src/languages/QOwnNotes_it.ts b/src/languages/QOwnNotes_it.ts
diff --git a/src/languages/QOwnNotes_ja.ts b/src/languages/QOwnNotes_ja.ts
diff --git a/src/languages/QOwnNotes_nl.ts b/src/languages/QOwnNotes_nl.ts
diff --git a/src/languages/QOwnNotes_no.ts b/src/languages/QOwnNotes_no.ts
diff --git a/src/languages/QOwnNotes_pl.ts b/src/languages/QOwnNotes_pl.ts
diff --git a/src/languages/QOwnNotes_pt_BR.ts b/src/languages/QOwnNotes_pt_BR.ts
diff --git a/src/languages/QOwnNotes_pt_PT.ts b/src/languages/QOwnNotes_pt_PT.ts
diff --git a/src/languages/QOwnNotes_ro.ts b/src/languages/QOwnNotes_ro.ts
diff --git a/src/languages/QOwnNotes_ru.ts b/src/languages/QOwnNotes_ru.ts
diff --git a/src/languages/QOwnNotes_sk.ts b/src/languages/QOwnNotes_sk.ts
diff --git a/src/languages/QOwnNotes_sl.ts b/src/languages/QOwnNotes_sl.ts
diff --git a/src/languages/QOwnNotes_sv.ts b/src/languages/QOwnNotes_sv.ts
diff --git a/src/languages/QOwnNotes_tl.ts b/src/languages/QOwnNotes_tl.ts
diff --git a/src/languages/QOwnNotes_tr.ts b/src/languages/QOwnNotes_tr.ts
diff --git a/src/languages/QOwnNotes_uk.ts b/src/languages/QOwnNotes_uk.ts
diff --git a/src/languages/QOwnNotes_ur.ts b/src/languages/QOwnNotes_ur.ts
diff --git a/src/languages/QOwnNotes_zh_CN.ts b/src/languages/QOwnNotes_zh_CN.ts
diff --git a/src/languages/QOwnNotes_zh_TW.ts b/src/languages/QOwnNotes_zh_TW.ts
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -10400,60 +10400,6 @@ void MainWindow::updateNoteSortOrderSelectorVisibility(bool visible) {
 //    ui->sortOrderSeparator->setVisible(visible);
 }
 
-/**
- * Shows a context menu for the note preview
- *
- * @param pos
- */
-void MainWindow::on_noteTextView_customContextMenuRequested(const QPoint &pos) {
-    QPoint globalPos = ui->noteTextView->mapToGlobal(pos);
-    QMenu *menu = ui->noteTextView->createStandardContextMenu();
-
-    QTextCursor c = ui->noteTextView->cursorForPosition(pos);
-    QTextFormat format = c.charFormat();
-    const QString &anchorHref = format.toCharFormat().anchorHref();
-    bool isImageFormat = format.isImageFormat();
-    bool isAnchor = !anchorHref.isEmpty();
-
-    if (isImageFormat || isAnchor) {
-        menu->addSeparator();
-    }
-
-    auto *copyImageAction = new QAction(this);
-    auto *copyLinkLocationAction = new QAction(this);
-
-    // check if clicked object was an image
-    if (isImageFormat) {
-        copyImageAction = menu->addAction(tr("Copy image file path"));
-    }
-
-    if (isAnchor) {
-        copyLinkLocationAction = menu->addAction(tr("Copy link location"));
-    }
-
-    QAction *selectedItem = menu->exec(globalPos);
-
-    if (selectedItem) {
-        // copy the image file path to the clipboard
-        if (selectedItem == copyImageAction) {
-            QString imagePath = format.toImageFormat().name();
-            QUrl imageUrl = QUrl(imagePath);
-
-            if (imageUrl.isLocalFile()) {
-                imagePath = imageUrl.toLocalFile();
-            }
-
-            QClipboard *clipboard = QApplication::clipboard();
-            clipboard->setText(imagePath);
-        }
-        // copy link location to the clipboard
-        else if (selectedItem == copyLinkLocationAction) {
-            QClipboard *clipboard = QApplication::clipboard();
-            clipboard->setText(anchorHref);
-        }
-    }
-}
-
 /**
  * Commits changes from the current note folder to git
  */

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -503,8 +503,6 @@ private slots:
 
     bool restoreActiveNoteHistoryItem();
 
-    void on_noteTextView_customContextMenuRequested(const QPoint &pos);
-
     void on_actionShow_note_git_versions_triggered();
 
     void on_tagTreeWidget_itemCollapsed(QTreeWidgetItem *item);

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -792,9 +792,6 @@
            <property name="enabled">
             <bool>true</bool>
            </property>
-           <property name="contextMenuPolicy">
-            <enum>Qt::CustomContextMenu</enum>
-           </property>
            <property name="styleSheet">
             <string notr="true"/>
            </property>
@@ -2499,9 +2496,9 @@ p, li { white-space: pre-wrap; }
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="breeze-qownnotes.qrc"/>
   <include location="images.qrc"/>
   <include location="breeze-dark-qownnotes.qrc"/>
+  <include location="breeze-qownnotes.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/widgets/notepreviewwidget.cpp b/src/widgets/notepreviewwidget.cpp
@@ -17,6 +17,10 @@
 #include <QDebug>
 #include <QRegExp>
 #include <QMovie>
+#include <QAction>
+#include <QApplication>
+#include <QMenu>
+#include <QClipboard>
 #include <QProxyStyle>
 
 class NoDottedOutlineForLinksStyle: public QProxyStyle {
@@ -37,7 +41,7 @@ NotePreviewWidget::NotePreviewWidget(QWidget *parent) : QTextBrowser(parent) {
     _searchWidget->setReplaceEnabled(false);
 
     // add a layout to the widget
-    QVBoxLayout *layout = new QVBoxLayout;
+    auto *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
     layout->setMargin(0);
     layout->addStretch();
@@ -203,3 +207,58 @@ void NotePreviewWidget::hide() {
     _searchWidget->hide();
     QWidget::hide();
 }
+
+/**
+ * Shows a context menu for the note preview
+ *
+ * @param event
+ */
+void NotePreviewWidget::contextMenuEvent(QContextMenuEvent *event) {
+    QPoint pos = event->pos();
+    QPoint globalPos = event->globalPos();
+    QMenu *menu = this->createStandardContextMenu();
+
+    QTextCursor c = this->cursorForPosition(pos);
+    QTextFormat format = c.charFormat();
+    const QString &anchorHref = format.toCharFormat().anchorHref();
+    bool isImageFormat = format.isImageFormat();
+    bool isAnchor = !anchorHref.isEmpty();
+
+    if (isImageFormat || isAnchor) {
+        menu->addSeparator();
+    }
+
+    auto *copyImageAction = new QAction(this);
+    auto *copyLinkLocationAction = new QAction(this);
+
+    // check if clicked object was an image
+    if (isImageFormat) {
+        copyImageAction = menu->addAction(tr("Copy image file path"));
+    }
+
+    if (isAnchor) {
+        copyLinkLocationAction = menu->addAction(tr("Copy link location"));
+    }
+
+    QAction *selectedItem = menu->exec(globalPos);
+
+    if (selectedItem) {
+        // copy the image file path to the clipboard
+        if (selectedItem == copyImageAction) {
+            QString imagePath = format.toImageFormat().name();
+            QUrl imageUrl = QUrl(imagePath);
+
+            if (imageUrl.isLocalFile()) {
+                imagePath = imageUrl.toLocalFile();
+            }
+
+            QClipboard *clipboard = QApplication::clipboard();
+            clipboard->setText(imagePath);
+        }
+            // copy link location to the clipboard
+        else if (selectedItem == copyLinkLocationAction) {
+            QClipboard *clipboard = QApplication::clipboard();
+            clipboard->setText(anchorHref);
+        }
+    }
+}
diff --git a/src/widgets/notepreviewwidget.h b/src/widgets/notepreviewwidget.h
@@ -15,6 +15,7 @@
 
 #include <QTextBrowser>
 #include <QResizeEvent>
+#include <QPoint>
 #include <widgets/qtexteditsearchwidget.h>
 
 class NotePreviewWidget : public QTextBrowser
@@ -32,12 +33,14 @@ class NotePreviewWidget : public QTextBrowser
     QTextEditSearchWidget *_searchWidget;
     QWidget *_searchFrame;
 
-    void resizeEvent(QResizeEvent* event);
-    bool eventFilter(QObject *obj, QEvent *event);
+    void resizeEvent(QResizeEvent* event) override;
+    bool eventFilter(QObject *obj, QEvent *event) override;
 
     QStringList extractGifUrls(const QString &text) const;
     void animateGif(const QString &text);
 
+    void contextMenuEvent(QContextMenuEvent *event) override;
+
 public slots:
     void hide();