anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-12 19:38:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the main document's buffer(), when scanning for citations from within the citation dialog.

Browse Source 
> This allows to pick and search for citations present in the main document.
>
> This was started to be discussed in a relatively unrelated bug #7581, then the patch
> was proposed here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg169277.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38849 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Tommaso Cucinotta 2011-05-27 06:05:14 +00:00
parent 0fcd94beec
commit b7532cd3b3
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontends/qt4/GuiCitation.cpp
View File

@ -20,6 +20,7 @@
#include "qt_helpers.h" #include "qt_helpers.h"
#include "Buffer.h" #include "Buffer.h"
#include "BufferView.h"
#include "BiblioInfo.h" #include "BiblioInfo.h"
#include "BufferParams.h" #include "BufferParams.h"
#include "FuncRequest.h" #include "FuncRequest.h"
@ -625,7 +626,7 @@ void GuiCitation::setCitedKeys()
bool GuiCitation::initialiseParams(string const & data) bool GuiCitation::initialiseParams(string const & data)
{ {
InsetCommand::string2params(data, params_); InsetCommand::string2params(data, params_);
CiteEngine const engine = buffer().params().citeEngine(); CiteEngine const engine = citeEngine();
citeStyles_ = citeStyles(engine); citeStyles_ = citeStyles(engine);
init(); init();
return true; return true;
@ -763,6 +764,15 @@ BiblioInfo const & GuiCitation::bibInfo() const
} }
Buffer const & GuiCitation::buffer() const
{
if (lyxview().documentBufferView())
return lyxview().documentBufferView()->buffer();
else
return lyxview().currentBufferView()->buffer();
}
void GuiCitation::saveSession() const void GuiCitation::saveSession() const
{ {
Dialog::saveSession(); Dialog::saveSession();

3
src/frontends/qt4/GuiCitation.h
View File

@ -42,6 +42,9 @@ public:
GuiCitation(GuiView & lv); GuiCitation(GuiView & lv);
/// ///
~GuiCitation(); ~GuiCitation();
/// We use the main document's buffer() so to catch the citations
/// defined there, also while using the dialog from the Adv F&R.
Buffer const & buffer() const;
private Q_SLOTS: private Q_SLOTS:
void on_okPB_clicked(); void on_okPB_clicked();