Merge branch 'master' into biblatex2

[lyx.git] / src / frontends / qt4 / GuiCitation.cpp

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 5ee05d518058cd7cb8283d5e291e25729cbe6eea..d73f3d3542683a0a44049cf5bcbbfb2ead31fed3 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -125,9 +125,9 @@ GuiCitation::GuiCitation(GuiView & lv)
        connect(citationStyleCO, SIGNAL(activated(int)),
                this, SLOT(on_citationStyleCO_currentIndexChanged(int)));
        connect(starredCB, SIGNAL(clicked()),
-               this, SLOT(changed()));
+               this, SLOT(updateStyles()));
        connect(forceuppercaseCB, SIGNAL(clicked()),
-               this, SLOT(changed()));
+               this, SLOT(updateStyles()));
        connect(textBeforeED, SIGNAL(textChanged(QString)),
                this, SLOT(updateStyles()));
        connect(textAfterED, SIGNAL(textChanged(QString)),
@@ -685,6 +685,8 @@ QStringList GuiCitation::citationStyles(BiblioInfo const & bi, size_t max_size)
        CiteItem ci;
        ci.textBefore = qstring_to_ucs4(textBeforeED->text());
        ci.textAfter = qstring_to_ucs4(textAfterED->text());
+       ci.forceUpperCase = forceuppercaseCB->isChecked();
+       ci.Starred = starredCB->isChecked();
        ci.context = CiteItem::Dialog;
        ci.max_size = max_size;
        vector<docstring> ret = bi.getCiteStrings(keys, styles, documentBuffer(), ci);