Browse Source

QuickAccess: support folder

Le Tan 3 years ago
parent
commit
ef7b28b6b3
3 changed files with 11 additions and 18 deletions
  1. 2 14
      src/widgets/notebooknodeexplorer.cpp
  2. 7 4
      src/widgets/toolbarhelper.cpp
  3. 2 0
      src/widgets/toolbarhelper.h

+ 2 - 14
src/widgets/notebooknodeexplorer.cpp

@@ -1305,27 +1305,15 @@ QAction *NotebookNodeExplorer::createAction(Action p_act, QObject *p_parent, boo
                 this, [this, p_master]() {
                     auto nodes = p_master ? getMasterSelectedNodesAndExternalNodes() : getSlaveSelectedNodesAndExternalNodes();
                     QStringList files;
-                    bool hasFilteredAway = false;
                     for (const auto &node : nodes.first) {
-                        if (node->hasContent()) {
-                            files.push_back(node->fetchAbsolutePath());
-                        } else {
-                            hasFilteredAway = true;
-                        }
+                        files.push_back(node->fetchAbsolutePath());
                     }
                     for (const auto &node : nodes.second) {
-                        if (!node->isFolder()) {
-                            files.push_back(node->fetchAbsolutePath());
-                        } else {
-                            hasFilteredAway = true;
-                        }
+                        files.push_back(node->fetchAbsolutePath());
                     }
                     if (!files.isEmpty()) {
                         emit VNoteX::getInst().pinToQuickAccessRequested(files);
                     }
-                    if (hasFilteredAway) {
-                        VNoteX::getInst().showStatusMessageShort(tr("Folder is not supported by quick access"));
-                    }
                 });
         break;
 

+ 7 - 4
src/widgets/toolbarhelper.cpp

@@ -261,8 +261,7 @@ QToolBar *ToolBarHelper::setupQuickAccessToolBar(MainWindow *p_win, QToolBar *p_
                                     return;
                                 }
 
-                                emit VNoteX::getInst().openFileRequested(quickAccess.first(),
-                                                                         QSharedPointer<FileOpenParameters>::create());
+                                activateQuickAccess(quickAccess.first());
                             });
         WidgetUtils::addActionShortcut(quickAccessAct,
                                        coreConfig.getShortcut(CoreConfig::Shortcut::QuickAccess));
@@ -275,8 +274,7 @@ QToolBar *ToolBarHelper::setupQuickAccessToolBar(MainWindow *p_win, QToolBar *p_
                             });
         MainWindow::connect(btnMenu, &QMenu::triggered,
                             btnMenu, [](QAction *p_act) {
-                                emit VNoteX::getInst().openFileRequested(p_act->data().toString(),
-                                                                         QSharedPointer<FileOpenParameters>::create());
+                                activateQuickAccess(p_act->data().toString());
                             });
         tb->addWidget(toolBtn);
     }
@@ -783,3 +781,8 @@ void ToolBarHelper::setupMenuButton(MainWindow *p_win, QToolBar *p_toolBar)
     WidgetUtils::addActionShortcut(quitAct,
                                    coreConfig.getShortcut(CoreConfig::Shortcut::Quit));
 }
+
+void ToolBarHelper::activateQuickAccess(const QString &p_file)
+{
+    emit VNoteX::getInst().openFileRequested(p_file, QSharedPointer<FileOpenParameters>::create());
+}

+ 2 - 0
src/widgets/toolbarhelper.h

@@ -51,6 +51,8 @@ namespace vnotex
         static void setupSettingsButton(MainWindow *p_win, QToolBar *p_toolBar);
 
         static void setupMenuButton(MainWindow *p_win, QToolBar *p_toolBar);
+
+        static void activateQuickAccess(const QString &p_file);
     };
 } // ns vnotex