Fixing link completion in O header/N editor on macOS which resolves #…

…1248
dvorka · Mar 8, 2020 · 29de855 · 29de855
1 parent 1ccdede
commit 29de855
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/app/src/qt/note_editor_view.h b/app/src/qt/note_editor_view.h
@@ -117,8 +117,8 @@ class NoteEditorView : public QPlainTextEdit
 private slots:
     void insertTab();
     void insertCompletion(const QString& completion, bool singleWord=false);
-    void slotStartLinkCompletion();
 public slots:
+    void slotStartLinkCompletion();
     void slotPerformLinkCompletion(const QString& completionPrefix, std::vector<std::string>* links);
 
     // line & line number

diff --git a/app/src/qt/orloj_presenter.cpp b/app/src/qt/orloj_presenter.cpp
@@ -107,6 +107,12 @@ OrlojPresenter::OrlojPresenter(MainWindowPresenter* mainPresenter,
     QObject::connect(
         navigatorPresenter, SIGNAL(signalThingSelected()),
         this, SLOT(slotShowNavigator()));
+    // N editor
+#ifdef __APPLE__
+    QObject::connect(
+        mainPresenter->getMainMenu()->getView()->actionEditComplete, SIGNAL(triggered()),
+        this, SLOT(slotEditStartLinkCompletion()));
+#endif
     // editor getting data from the backend
     QObject::connect(
         view->getNoteEdit()->getNoteEditor(), SIGNAL(signalGetLinksForPattern(const QString&)),
@@ -794,6 +800,15 @@ void OrlojPresenter::refreshLiveNotePreview()
     }
 }
 
+void OrlojPresenter::slotEditStartLinkCompletion()
+{
+    if(isFacetActive(OrlojPresenterFacets::FACET_EDIT_NOTE)) {
+        view->getNoteEdit()->getNoteEditor()->slotStartLinkCompletion();
+    } else if(isFacetActive(OrlojPresenterFacets::FACET_EDIT_OUTLINE_HEADER)) {
+        view->getOutlineHeaderEdit()->getHeaderEditor()->slotStartLinkCompletion();
+    }
+}
+
 void OrlojPresenter::slotRefreshCurrentNotePreview()
 {
     MF_DEBUG("Slot to refresh live preview: " << getFacet() << " hoist: " << config.isUiHoistedMode() << endl);

diff --git a/app/src/qt/orloj_presenter.h b/app/src/qt/orloj_presenter.h
@@ -208,6 +208,7 @@ public slots:
     void slotRefreshCurrentNotePreview();
     void slotOutlinesTableSorted(int column);
     void slotToggleFullOutlinePreview();
+    void slotEditStartLinkCompletion();
 
 signals:
     void signalLinksForPattern(const QString& completionPrefix, std::vector<std::string>* links);

diff --git a/lib/src/debug.h b/lib/src/debug.h
@@ -32,7 +32,7 @@
     #define MF_DEBUG(x) do { std::cerr << x; } while (0)
 
     // enable/disable verbose debug of particular components
-    #define MF_DEBUG_HTML
+    //#define MF_DEBUG_HTML
     //#define MF_DEBUG_ASYNC_TASKS
     //#define MF_DEBUG_QRC
     //#define MF_DEBUG_L10N