Fix handling of the add branch textfield in GuiBranches

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

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index badf8d171ede17f4c0c21db1869afea527fb01dd..9e815271de13cdf62121558e868c52e3167fc68e 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -949,8 +949,8 @@ void MenuDefinition::expandDocuments()
        Buffer * b = first;
        // We cannot use a for loop as the buffer list cycles.
        do {
-               if (guiApp->currentView()
-                   && guiApp->currentView()->workArea(*b)) {
+               if (!(guiApp->currentView()
+                   && guiApp->currentView()->workArea(*b))) {
                        QString label = toqstr(b->fileName().displayName(20));
                        if (!b->isClean())
                                label += "*";
@@ -1485,24 +1485,38 @@ void MenuDefinition::expandCiteStyles(BufferView const * bv)
                                static_cast<InsetCommand const *>(inset);
 
        Buffer const * buf = &bv->buffer();
-       docstring key = citinset->getParam("key");
-       // we can only handle one key currently
-       if (contains(key, ','))
-               key = qstring_to_ucs4(toqstr(key).split(',')[0]);
+       string const cmd = citinset->params().getCmdName();
 
-       vector<CiteStyle> citeStyleList = citeStyles(buf->params().citeEngine(),
-               buf->params().citeEngineType());
-       docstring_list citeStrings =
-               buf->masterBibInfo().getCiteStrings(key, bv->buffer());
+       docstring const & key = citinset->getParam("key");
+       if (key.empty()) {
+               add(MenuItem(MenuItem::Command,
+                                   qt_("No citations selected!"),
+                                   FuncRequest(LFUN_NOACTION)));
+               return;
+       }
+
+       docstring const & before = citinset->getParam("before");
+       docstring const & after = citinset->getParam("after");
+
+       size_t const n = cmd.size();
+       bool const force = cmd[0] == 'C';
+       bool const full = cmd[n] == '*';
+
+       vector<docstring> const keys = getVectorFromString(key);
+
+       vector<CitationStyle> const citeStyleList = buf->params().citeStyles();
+       vector<docstring> citeStrings =
+               buf->masterBibInfo().getCiteStrings(keys, citeStyleList, bv->buffer(),
+               false, before, after, from_utf8("dialog"));
 
-       docstring_list::const_iterator cit = citeStrings.begin();
-       docstring_list::const_iterator end = citeStrings.end();
+       vector<docstring>::const_iterator cit = citeStrings.begin();
+       vector<docstring>::const_iterator end = citeStrings.end();
 
        for (int ii = 1; cit != end; ++cit, ++ii) {
                docstring label = *cit;
-               CitationStyle cs;
-               CiteStyle cst = citeStyleList[ii - 1];
-               cs.style = cst;
+               CitationStyle cs = citeStyleList[ii - 1];
+               cs.forceUpperCase &= force;
+               cs.fullAuthorList &= full;
                addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(label),
                                    FuncRequest(LFUN_INSET_MODIFY,
                                                "changetype " + from_utf8(citationStyleToString(cs)))));