Amend cab46ff9d1ea3

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

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 41de1e5ed72740ad81283f6491dcc08198ff88bf..5e35afca793dd75001c4aaa08f5f10c476b18493 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_);
 }
 
@@ -357,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."));
 }
 
 
@@ -579,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);
 }
 
@@ -733,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;