X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCitation.cpp;h=5e35afca793dd75001c4aaa08f5f10c476b18493;hb=f973855bdea94f0c6edf8eace7548a440f005902;hp=cc1e7e5c934c04ae18c1b8c736c9a49c2f230c6e;hpb=3cb271cedad2e75c8f8e1860119d6b326d90c186;p=lyx.git

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index cc1e7e5c93..5e35afca79 100644
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -136,9 +136,9 @@ GuiCitation::GuiCitation(GuiView & lv)
 	connect(textAfterED, SIGNAL(textChanged(QString)),
 		this, SLOT(updateStyles()));
 	connect(textBeforeED, SIGNAL(returnPressed()),
-		this, SLOT(on_okPB_clicked()));
+		this, SLOT(on_buttonBox_accepted()));
 	connect(textAfterED, SIGNAL(returnPressed()),
-		this, SLOT(on_okPB_clicked()));
+		this, SLOT(on_buttonBox_accepted()));
 
 	selectionManager = new GuiSelectionManager(this, availableLV, selectedLV,
 			addPB, deletePB, upPB, downPB, &available_model_, &selected_model_, 1);
@@ -147,7 +147,7 @@ GuiCitation::GuiCitation(GuiView & lv)
 	connect(selectionManager, SIGNAL(updateHook()),
 		this, SLOT(updateControls()));
 	connect(selectionManager, SIGNAL(okHook()),
-		this, SLOT(on_okPB_clicked()));
+		this, SLOT(on_buttonBox_accepted()));
 
 	connect(filter_, SIGNAL(rightButtonClicked()),
 		this, SLOT(resetFilter()));
@@ -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_);
 }
 
@@ -202,13 +204,14 @@ void GuiCitation::applyView()
 
 void GuiCitation::showEvent(QShowEvent * e)
 {
-	filter_->clear();
+	if (!filter_->text().isEmpty())
+		filterPressed();
 	availableLV->setFocus();
 	DialogView::showEvent(e);
 }
 
 
-void GuiCitation::on_okPB_clicked()
+void GuiCitation::on_buttonBox_accepted()
 {
 	applyView();
 	clearSelection();
@@ -216,24 +219,27 @@ void GuiCitation::on_okPB_clicked()
 }
 
 
-void GuiCitation::on_cancelPB_clicked()
+void GuiCitation::on_buttonBox_rejected()
 {
 	clearSelection();
 	hide();
 }
 
 
-void GuiCitation::on_applyPB_clicked()
+void GuiCitation::on_buttonBox_clicked(QAbstractButton * button)
 {
-	applyView();
-}
-
-
-void GuiCitation::on_restorePB_clicked()
-{
-	init();
-	updateFilterHint();
-	filterPressed();
+	switch (buttonBox->standardButton(button)) {
+	case QDialogButtonBox::Apply:
+		applyView();
+		break;
+	case QDialogButtonBox::Reset:
+		init();
+		updateFilterHint();
+		filterPressed();
+		break;
+	default:
+		break;
+	}
 }
 
 
@@ -353,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."));
 }
 
 
@@ -452,8 +464,8 @@ bool GuiCitation::isSelected(QModelIndex const & idx)
 void GuiCitation::setButtons()
 {
 	int const srows = selectedLV->model()->rowCount();
-	applyPB->setEnabled(srows > 0);
-	okPB->setEnabled(srows > 0);
+	buttonBox->button(QDialogButtonBox::Apply)->setEnabled(srows > 0);
+	buttonBox->button(QDialogButtonBox::Ok)->setEnabled(srows > 0);
 }
 
 
@@ -575,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);
 }
 
@@ -729,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;
@@ -802,8 +815,8 @@ void GuiCitation::init()
 	} else
 		availableLV->setFocus();
 
-	applyPB->setEnabled(false);
-	okPB->setEnabled(false);
+	buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
+	buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
 }