Use <cstdint> instead of <boost/cstdint.hpp>

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

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index ccd7425ceece86dfc209d293eee494602d0f94b8..196ec44d2b7b5bb6c26c022353082e03e62edf61 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -175,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_);
 }
 
@@ -266,7 +268,7 @@ void GuiCitation::updateControls(BiblioInfo const & bi)
        int i = citationStyleCO->currentIndex();
        if (i == -1 || i > int(citeStyles_.size()))
                i = 0;
-       updateFormatting(citeStyles_[i]);
+       updateFormatting(citeStyles_[size_type(i)]);
        selectionManager->update();
 }
 
@@ -285,7 +287,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);
@@ -357,6 +362,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."));
 }
 
 
@@ -490,7 +501,7 @@ void GuiCitation::findText(QString const & text, bool reset)
                //either "All Fields" or "Keys" or an invalid value
                field = from_ascii("");
        else
-               field = fields[index];
+               field = fields[size_type(index)];
 
        //Was it "Keys"?
        bool const onlyKeys = index == -1;
@@ -502,7 +513,7 @@ void GuiCitation::findText(QString const & text, bool reset)
        if (index < 0 || index >= int(entries.size()))
                entry_type = from_ascii("");
        else
-               entry_type = entries[index];
+               entry_type = entries[size_type(index)];
 
        bool const case_sentitive = casesense_->isChecked();
        bool const reg_exp = regexp_->isChecked();
@@ -534,7 +545,7 @@ void GuiCitation::on_citationStyleCO_currentIndexChanged(int index)
 {
        if (index >= 0 && index < citationStyleCO->count()) {
                vector<CitationStyle> const & styles = citeStyles_;
-               updateFormatting(styles[index]);
+               updateFormatting(styles[size_type(index)]);
                changed();
        }
 }
@@ -610,7 +621,7 @@ void GuiCitation::applyParams(int const choice, bool full, bool force,
 
        vector<CitationStyle> const & styles = citeStyles_;
 
-       CitationStyle cs = styles[choice];
+       CitationStyle cs = styles[size_type(choice)];
 
        if (!cs.textBefore)
                before.clear();
@@ -803,7 +814,7 @@ void GuiCitation::init()
                citationStyleCO->blockSignals(true);
                citationStyleCO->setCurrentIndex(i);
                citationStyleCO->blockSignals(false);
-               updateFormatting(citeStyles_[i]);
+               updateFormatting(citeStyles_[size_type(i)]);
        } else
                availableLV->setFocus();
 
@@ -874,7 +885,7 @@ BiblioInfo::CiteStringMap GuiCitation::citationStyles(BiblioInfo const & bi, siz
        int ind = citationStyleCO->currentIndex();
        if (ind == -1)
                ind = 0;
-       CitationStyle cs = styles[ind];
+       CitationStyle cs = styles[size_type(ind)];
        vector<docstring> pretexts = getPreTexts();
        vector<docstring> posttexts = getPostTexts();
        bool const qualified = cs.hasQualifiedList