Fix reloading of local layout file (bug #11120)

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

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index d5f1ebb28ab5616cc1d59c64857963ac0105f410..638ec7d84da8bae0750230c165d4fa973f241cd5 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -27,6 +27,7 @@
 #include "TextClass.h"
 #include "FuncRequest.h"
 
+#include "insets/InsetCitation.h"
 #include "insets/InsetCommand.h"
 
 #include "support/debug.h"
@@ -92,7 +93,7 @@ static vector<lyx::docstring> to_docstring_vector(QStringList const & qlist)
 
 GuiCitation::GuiCitation(GuiView & lv)
        : DialogView(lv, "citation", qt_("Citation")),
-         style_(0), params_(insetCode("citation"))
+         style_(QString()), params_(insetCode("citation"))
 {
        setupUi(this);
 
@@ -174,6 +175,8 @@ GuiCitation::GuiCitation(GuiView & lv)
        selectedLV->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
 #endif
 
+       selectedLV->setToolTip(qt_("Ordered list of all cited references.\n"
+                                  "You can reorder, add and remove references with the buttons on the left."));
        setFocusProxy(filter_);
 }
 
@@ -188,7 +191,7 @@ void GuiCitation::closeEvent(QCloseEvent * e)
 void GuiCitation::applyView()
 {
        int const choice = max(0, citationStyleCO->currentIndex());
-       style_ = choice;
+       style_ = citationStyleCO->itemData(citationStyleCO->currentIndex()).toString();
        bool const full  = starredCB->isChecked();
        bool const force = forceuppercaseCB->isChecked();
 
@@ -201,7 +204,8 @@ void GuiCitation::applyView()
 
 void GuiCitation::showEvent(QShowEvent * e)
 {
-       filter_->clear();
+       if (!filter_->text().isEmpty())
+               filterPressed();
        availableLV->setFocus();
        DialogView::showEvent(e);
 }
@@ -232,12 +236,13 @@ void GuiCitation::on_restorePB_clicked()
 {
        init();
        updateFilterHint();
+       filterPressed();
 }
 
 
 void GuiCitation::on_literalCB_clicked()
 {
-       literal_ = literalCB->isChecked();
+       InsetCitation::last_literal = literalCB->isChecked();
        changed();
 }
 
@@ -258,7 +263,7 @@ void GuiCitation::updateControls(BiblioInfo const & bi)
        QModelIndex idx = selectionManager->getSelectedIndex(1);
        updateInfo(bi, idx);
        int i = citationStyleCO->currentIndex();
-       if (i == -1)
+       if (i == -1 || i > int(citeStyles_.size()))
                i = 0;
        updateFormatting(citeStyles_[i]);
        selectionManager->update();
@@ -279,7 +284,10 @@ void GuiCitation::updateFormatting(CitationStyle const & currentStyle)
        bool const qualified = currentStyle.hasQualifiedList
                && (rows > 1
                    || !params_["pretextlist"].empty()
-                   || !params_["posttextlist"].empty());
+                   || !params_["posttextlist"].empty()
+                   || !getPreTexts().empty()
+                   || !getPostTexts().empty());
+
        selectedLV->horizontalHeader()->setVisible(qualified);
        selectedLV->setColumnHidden(0, !qualified);
        selectedLV->setColumnHidden(2, !qualified);
@@ -311,10 +319,10 @@ void GuiCitation::updateFormatting(CitationStyle const & currentStyle)
 
        forceuppercaseCB->setEnabled(force && haveSelection);
        if (force && haveSelection)
-               forceuppercaseCB->setToolTip("Force upper case in names (\"Del Piero\", not \"del Piero\").");
+               forceuppercaseCB->setToolTip(qt_("Force upper case in names (\"Del Piero\", not \"del Piero\")."));
        else
-               forceuppercaseCB->setToolTip("Force upper case in names (\"Del Piero\", not \"del Piero\"), "
-                                            "if the current citation style supports this.");
+               forceuppercaseCB->setToolTip(qt_("Force upper case in names (\"Del Piero\", not \"del Piero\"), "
+                                            "if the current citation style supports this."));
        starredCB->setEnabled(full && haveSelection);
        textBeforeED->setEnabled(textbefore && haveSelection);
        textBeforeLA->setEnabled(textbefore && haveSelection);
@@ -351,6 +359,12 @@ void GuiCitation::updateFormatting(CitationStyle const & currentStyle)
                        starredCB->setToolTip(qt_("Always list all authors (rather than using \"et al.\"), "
                                                  "if the current citation style supports this."));
        }
+       if (availableLV->selectionModel()->selectedIndexes().isEmpty())
+               availableLV->setToolTip(qt_("All references available for citing."));
+       else
+               availableLV->setToolTip(qt_("All references available for citing.\n"
+                                           "To add the selected one, hit Add, press Enter or double-click.\n"
+                                           "Hit Ctrl-Enter to add and close the dialog."));
 }
 
 
@@ -379,9 +393,9 @@ void GuiCitation::updateStyles(BiblioInfo const & bi)
        }
 
        static const size_t max_length = 80;
-       QStringList sty = citationStyles(bi, max_length);
+       BiblioInfo::CiteStringMap sty = citationStyles(bi, max_length);
 
-       if (sty.isEmpty()) {
+       if (sty.empty()) {
                // some error
                citationStyleCO->setEnabled(false);
                citationStyleLA->setEnabled(false);
@@ -391,16 +405,21 @@ void GuiCitation::updateStyles(BiblioInfo const & bi)
 
        citationStyleCO->blockSignals(true);
 
-       // save old index
-       int const curindex = citationStyleCO->currentIndex();
-       int const oldIndex = (curindex < 0) ? style_ : curindex;
+       // save old style selection
+       QString const curdata =
+               citationStyleCO->itemData(citationStyleCO->currentIndex()).toString();
+       QString const olddata = (curdata.isEmpty()) ? style_ : curdata;
        citationStyleCO->clear();
-       citationStyleCO->insertItems(0, sty);
+       BiblioInfo::CiteStringMap::const_iterator cit = sty.begin();
+       BiblioInfo::CiteStringMap::const_iterator end = sty.end();
+       for (int ii = 1; cit != end; ++cit, ++ii)
+               citationStyleCO->addItem(toqstr(cit->second), toqstr(cit->first));
        citationStyleCO->setEnabled(true);
        citationStyleLA->setEnabled(true);
-       // restore old index
-       if (oldIndex != -1 && oldIndex < citationStyleCO->count())
-               citationStyleCO->setCurrentIndex(oldIndex);
+       // restore old style selection
+       int const i = citationStyleCO->findData(olddata);
+       if (i != -1)
+               citationStyleCO->setCurrentIndex(i);
 
        citationStyleCO->blockSignals(false);
 }
@@ -568,9 +587,10 @@ void GuiCitation::regexChanged()
 
 void GuiCitation::updateFilterHint()
 {
-       QString const hint = instant_->isChecked() ?
+       QString hint = instant_->isChecked() ?
                qt_("Enter string to filter the list of available citations") :
                qt_("Enter string to filter the list of available citations and press <Enter>");
+       hint += qt_("\nThe down arrow key will get you into the list of filtered citations.");
        filter_->setToolTip(hint);
 }
 
@@ -722,7 +742,7 @@ vector<docstring> GuiCitation::getPostTexts()
        for (int i = 0; i != selected_model_.rowCount(); ++i) {
                QStandardItem const * key = selected_model_.item(i, 1);
                QStandardItem const * post = selected_model_.item(i, 2);
-               if (key && post)
+               if (key && post && !key->text().isEmpty() && !post->text().isEmpty())
                        res.push_back(qstring_to_ucs4(key->text()) + " " + qstring_to_ucs4(post->text()));
        }
        return res;
@@ -763,7 +783,7 @@ void GuiCitation::init()
        // if this is a new citation, we set the literal checkbox
        // to its last set value.
        if (cited_keys_.isEmpty())
-               literalCB->setChecked(literal_);
+               literalCB->setChecked(InsetCitation::last_literal);
        else
                literalCB->setChecked(params_["literal"] == "true");
 
@@ -855,7 +875,7 @@ void GuiCitation::findKey(BiblioInfo const & bi,
 }
 
 
-QStringList GuiCitation::citationStyles(BiblioInfo const & bi, size_t max_size)
+BiblioInfo::CiteStringMap GuiCitation::citationStyles(BiblioInfo const & bi, size_t max_size)
 {
        vector<docstring> const keys = to_docstring_vector(cited_keys_);
        vector<CitationStyle> styles = citeStyles_;
@@ -891,8 +911,8 @@ QStringList GuiCitation::citationStyles(BiblioInfo const & bi, size_t max_size)
        ci.isQualified = qualified;
        ci.pretexts = pres;
        ci.posttexts = posts;
-       vector<docstring> ret = bi.getCiteStrings(keys, styles, documentBuffer(), ci);
-       return to_qstring_list(ret);
+       BiblioInfo::CiteStringMap ret = bi.getCiteStrings(keys, styles, documentBuffer(), ci);
+       return ret;
 }
 
 
@@ -1044,10 +1064,9 @@ BiblioInfo const & GuiCitation::bibInfo() const
 }
 
 
-void GuiCitation::saveSession() const
+void GuiCitation::saveSession(QSettings & settings) const
 {
-       Dialog::saveSession();
-       QSettings settings;
+       Dialog::saveSession(settings);
        settings.setValue(
                sessionKey() + "/regex", regexp_->isChecked());
        settings.setValue(
@@ -1057,7 +1076,7 @@ void GuiCitation::saveSession() const
        settings.setValue(
                sessionKey() + "/citestyle", style_);
        settings.setValue(
-               sessionKey() + "/literal", literal_);
+               sessionKey() + "/literal", InsetCitation::last_literal);
 }
 
 
@@ -1068,8 +1087,9 @@ void GuiCitation::restoreSession()
        regexp_->setChecked(settings.value(sessionKey() + "/regex").toBool());
        casesense_->setChecked(settings.value(sessionKey() + "/casesensitive").toBool());
        instant_->setChecked(settings.value(sessionKey() + "/autofind", true).toBool());
-       style_ = settings.value(sessionKey() + "/citestyle").toInt();
-       literal_ = settings.value(sessionKey() + "/literal", false).toBool();
+       style_ = settings.value(sessionKey() + "/citestyle").toString();
+       InsetCitation::last_literal = 
+               settings.value(sessionKey() + "/literal", false).toBool();
        updateFilterHint();
 }