tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Arrange things so that "open parent" selects the file child when the parent is a directory

Browse Source
This commit is contained in:
Jean-Francois Dockes
2013-02-27 14:36:45 +01:00
parent 66f7ac31eb
commit 66a5d9ab83
5 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qtgui/reslist.cpp
+10 -2
View File
@@ -930,13 +930,19 @@ void ResList::createPopupMenu(const QPoint& pos)
}
popup->addAction(tr("Find &similar documents"), this, SLOT(menuExpand()));
popup->addAction(tr("Preview P&arent document/folder"),
this, SLOT(menuPreviewParent()));
Rcl::Doc pdoc;
if (m_source.isNotNull() && m_source->getEnclosing(doc, pdoc))
popup->addAction(tr("Preview P&arent document/folder"),
this, SLOT(menuPreviewParent()));
popup->addAction(tr("&Open Parent document/folder"),
this, SLOT(menuOpenParent()));
if (havedoc && doc.haspages && m_source->snippetsCapable())
popup->addAction(tr("Open &Snippets window"),
this, SLOT(menuOpenSnippets()));
popup->popup(mapToGlobal(pos));
}
@@ -983,6 +989,8 @@ void ResList::menuOpenParent()
// No parent doc: show enclosing folder with app configured for
// directories
pdoc.url = path_getfather(doc.url);
pdoc.meta[Rcl::Doc::keychildurl] = doc.url;
pdoc.meta[Rcl::Doc::keyapptg] = "parentopen";
pdoc.mimetype = "application/x-fsdirectory";
emit editRequested(pdoc);
}
src/qtgui/restable.cpp
+13 -2
View File
@@ -745,11 +745,18 @@ void ResTable::createPopupMenu(const QPoint& pos)
popup->addAction(tr("&Open"), this, SLOT(menuEdit()));
popup->addAction(tr("Copy &File Name"), this, SLOT(menuCopyFN()));
popup->addAction(tr("Copy &URL"), this, SLOT(menuCopyURL()));
if (m_detaildoc.ipath.empty())
popup->addAction(tr("&Write to File"), this, SLOT(menuSaveToFile()));
popup->addAction(tr("Find &similar documents"), this, SLOT(menuExpand()));
popup->addAction(tr("Preview P&arent document/folder"),
this, SLOT(menuPreviewParent()));
RefCntr<DocSequence> source = m_model->getDocSource();
Rcl::Doc pdoc;
if (source.isNotNull() && source->getEnclosing(m_detaildoc, pdoc))
popup->addAction(tr("Preview P&arent document/folder"),
this, SLOT(menuPreviewParent()));
popup->addAction(tr("&Open Parent document/folder"),
this, SLOT(menuOpenParent()));
popup->popup(mapToGlobal(pos));
@@ -784,6 +791,8 @@ void ResTable::menuPreviewParent()
// No parent doc: show enclosing folder with app configured for
// directories
pdoc.url = path_getfather(doc.url);
pdoc.meta[Rcl::Doc::keychildurl] = doc.url;
pdoc.meta[Rcl::Doc::keyapptg] = "parentopen";
pdoc.mimetype = "application/x-fsdirectory";
emit editRequested(pdoc);
}
@@ -804,6 +813,8 @@ void ResTable::menuOpenParent()
// No parent doc: show enclosing folder with app configured for
// directories
pdoc.url = path_getfather(doc.url);
pdoc.meta[Rcl::Doc::keychildurl] = doc.url;
pdoc.meta[Rcl::Doc::keyapptg] = "parentopen";
pdoc.mimetype = "application/x-fsdirectory";
emit editRequested(pdoc);
}