dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

UniversalEntry: U to search the content of notes in Explorer root directory

Browse Source
This commit is contained in:
Le Tan 2018-07-18 20:05:27 +08:00
parent 5f65dc95c5
commit 2ae742cc07
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/vmainwindow.cpp
View File

@ -3222,6 +3222,7 @@ void VMainWindow::initUniversalEntry()
m_ue->registerEntry('t', searchUE, VSearchUE::Name_Note_Buffer);
m_ue->registerEntry('g', searchUE, VSearchUE::Content_Note_Buffer);
m_ue->registerEntry('b', searchUE, VSearchUE::Outline_Note_Buffer);
m_ue->registerEntry('u', searchUE, VSearchUE::Content_Note_ExplorerDirectory);
m_ue->registerEntry('y', new VOutlineUE(this), 0);
m_ue->registerEntry('h', searchUE, VSearchUE::Path_FolderNote_AllNotebook);
m_ue->registerEntry('n', searchUE, VSearchUE::Path_FolderNote_CurrentNotebook);

37
src/vsearchue.cpp
View File

@ -16,6 +16,7 @@
#include "vdirectory.h"
#include "vdirectorytree.h"
#include "veditarea.h"
#include "vexplorer.h"
extern VNote *g_vnote;
@ -81,6 +82,9 @@ QString VSearchUE::description(int p_id) const
case ID::Path_FolderNote_CurrentNotebook:
return tr("Search the path of folders/notes in current notebook");
case ID::Content_Note_ExplorerDirectory:
return tr("Search the content of notes in Explorer root directory");
default:
Q_ASSERT(false);
return tr("Invalid ID %1").arg(p_id);
@ -147,6 +151,7 @@ QWidget *VSearchUE::widget(int p_id)
case ID::Content_Note_AllNotebook:
case ID::Content_Note_CurrentNotebook:
case ID::Content_Note_CurrentFolder:
case ID::Content_Note_ExplorerDirectory:
case ID::Content_Note_Buffer:
case ID::Outline_Note_Buffer:
return m_treeWidget;
@ -205,6 +210,10 @@ void VSearchUE::processCommand(int p_id, const QString &p_cmd)
searchContentOfNoteInCurrentFolder(p_cmd);
break;
case ID::Content_Note_ExplorerDirectory:
searchContentOfNoteInExplorerDirectory(p_cmd);
break;
case ID::Tag_Note_CurrentFolder:
searchTagOfNoteInCurrentFolder(p_cmd);
break;
@ -475,6 +484,27 @@ void VSearchUE::searchContentOfNoteInCurrentFolder(const QString &p_cmd)
}
}
void VSearchUE::searchContentOfNoteInExplorerDirectory(const QString &p_cmd)
{
if (p_cmd.isEmpty()) {
m_inSearch = false;
emit stateUpdated(State::Success);
} else {
QString rootDirectory = g_mainWin->getExplorer()->getRootDirectory();
m_search->clear();
QSharedPointer<VSearchConfig> config(new VSearchConfig(VSearchConfig::ExplorerDirectory,
VSearchConfig::Content,
VSearchConfig::Note,
VSearchConfig::Internal,
VSearchConfig::NoneOption,
p_cmd,
QString()));
m_search->setConfig(config);
QSharedPointer<VSearchResult> result = m_search->search(rootDirectory);
handleSearchFinished(result);
}
}
QVector<VFile *> getFilesInBuffer()
{
QVector<VEditTabInfo> tabs = g_mainWin->getEditArea()->getAllTabsInfo();
@ -639,6 +669,7 @@ void VSearchUE::handleSearchItemAdded(const QSharedPointer<VSearchResultItem> &p
case ID::Content_Note_AllNotebook:
case ID::Content_Note_CurrentNotebook:
case ID::Content_Note_CurrentFolder:
case ID::Content_Note_ExplorerDirectory:
case ID::Content_Note_Buffer:
case ID::Outline_Note_Buffer:
appendItemToTree(p_item);
@ -684,6 +715,7 @@ void VSearchUE::handleSearchItemsAdded(const QList<QSharedPointer<VSearchResultI
case ID::Content_Note_AllNotebook:
case ID::Content_Note_CurrentNotebook:
case ID::Content_Note_CurrentFolder:
case ID::Content_Note_ExplorerDirectory:
case ID::Content_Note_Buffer:
case ID::Outline_Note_Buffer:
{
@ -941,6 +973,7 @@ void VSearchUE::selectNextItem(int p_id, bool p_forward)
case ID::Content_Note_AllNotebook:
case ID::Content_Note_CurrentNotebook:
case ID::Content_Note_CurrentFolder:
case ID::Content_Note_ExplorerDirectory:
case ID::Content_Note_Buffer:
case ID::Outline_Note_Buffer:
{
@ -974,6 +1007,7 @@ void VSearchUE::activate(int p_id)
case ID::Content_Note_AllNotebook:
case ID::Content_Note_CurrentNotebook:
case ID::Content_Note_CurrentFolder:
case ID::Content_Note_ExplorerDirectory:
case ID::Content_Note_Buffer:
case ID::Outline_Note_Buffer:
{
@ -1000,6 +1034,7 @@ void VSearchUE::selectParentItem(int p_id)
case ID::Content_Note_AllNotebook:
case ID::Content_Note_CurrentNotebook:
case ID::Content_Note_CurrentFolder:
case ID::Content_Note_ExplorerDirectory:
case ID::Content_Note_Buffer:
case ID::Outline_Note_Buffer:
m_treeWidget->selectParentItem();
@ -1016,6 +1051,7 @@ void VSearchUE::toggleItemExpanded(int p_id)
case ID::Content_Note_AllNotebook:
case ID::Content_Note_CurrentNotebook:
case ID::Content_Note_CurrentFolder:
case ID::Content_Note_ExplorerDirectory:
case ID::Content_Note_Buffer:
case ID::Outline_Note_Buffer:
{
@ -1112,6 +1148,7 @@ QString VSearchUE::currentItemFolder(int p_id)
case ID::Content_Note_AllNotebook:
case ID::Content_Note_CurrentNotebook:
case ID::Content_Note_CurrentFolder:
case ID::Content_Note_ExplorerDirectory:
case ID::Content_Note_Buffer:
case ID::Outline_Note_Buffer:
{

7
src/vsearchue.h
View File

@ -63,7 +63,10 @@ public:
Path_FolderNote_AllNotebook,
// Search path of folder/note in current notebook.
Path_FolderNote_CurrentNotebook
Path_FolderNote_CurrentNotebook,
// Search content of the note in Explorer root directory.
Content_Note_ExplorerDirectory
};
explicit VSearchUE(QObject *p_parent = nullptr);
@ -127,6 +130,8 @@ private:
void searchContentOfNoteInCurrentFolder(const QString &p_cmd);
void searchContentOfNoteInExplorerDirectory(const QString &p_cmd);
void searchNameOfBuffer(const QString &p_cmd);
void searchContentOfBuffer(const QString &p_cmd);