X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt2%2FQCitationDialog.C;h=8b6588309de6c3fecce57faa879b7a9d2dcda181;hb=1fcedd4b635807e7046342f324d054c04c37f054;hp=282aa21f68900703a976a6e8d1eb14284ea53403;hpb=814b8194510a5607638f81b10c939723835c1145;p=lyx.git

diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C
index 282aa21f68..8b6588309d 100644
--- a/src/frontends/qt2/QCitationDialog.C
+++ b/src/frontends/qt2/QCitationDialog.C
@@ -10,13 +10,10 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include <algorithm>
 
-#include "gettext.h"
+#include "qt_helpers.h"
 #include "controllers/ControlCitation.h"
 #include "LyXView.h"
 #include "buffer.h"
@@ -52,7 +49,7 @@ QCitationDialog::QCitationDialog(QCitation * form)
 	connect(searchED, SIGNAL(returnPressed()),
 		this, SLOT(slotNextClicked()));
 
-	textBeforeED->setText(_("Not yet supported"));
+	textBeforeED->setText(qt_("Not yet supported"));
 	textBeforeED->setReadOnly(true);
 	textBeforeED->setFocusPolicy(QWidget::NoFocus);
 	citationStyleCO->setEnabled(false);
@@ -91,7 +88,7 @@ void QCitationDialog::slotBibHighlighted(int sel)
 	// the selected browser_bib key
 	infoML->clear();
 
-	infoML->setText(biblio::getInfo(theMap, form_->bibkeys[sel]).c_str());
+	infoML->setText(toqstr(biblio::getInfo(theMap, form_->bibkeys[sel])));
 
 	// Highlight the selected browser_bib key in browser_cite if
 	// present
@@ -144,7 +141,7 @@ void QCitationDialog::slotCiteHighlighted(int sel)
 		// Put into browser_info the additional info associated
 		// with the selected browser_cite key
 		infoML->clear();
-		infoML->setText(biblio::getInfo(theMap, form_->citekeys[sel]).c_str());
+		infoML->setText(toqstr(biblio::getInfo(theMap, form_->citekeys[sel])));
 	}
 }
 
@@ -159,7 +156,7 @@ void QCitationDialog::slotAddClicked()
 	}
 
 	// Add the selected browser_bib key to browser_cite
-	citeLB->insertItem(form_->bibkeys[sel].c_str());
+	citeLB->insertItem(toqstr(form_->bibkeys[sel]));
 	form_->citekeys.push_back(form_->bibkeys[sel]);
 
 	int const n = int(form_->citekeys.size());
@@ -169,6 +166,7 @@ void QCitationDialog::slotAddClicked()
 	form_->setBibButtons(QCitation::OFF);
 	form_->setCiteButtons(QCitation::ON);
 	form_->changed();
+	form_->fillStyles();
 }
 
 
@@ -188,6 +186,8 @@ void QCitationDialog::slotDelClicked()
 	form_->setBibButtons(QCitation::ON);
 	form_->setCiteButtons(QCitation::OFF);
 	form_->changed();
+	form_->fillStyles();
+	form_->updateStyle();
 }
 
 
@@ -207,11 +207,12 @@ void QCitationDialog::slotUpClicked()
 	citeLB->removeItem(sel);
 	form_->citekeys.erase(it);
 
-	citeLB->insertItem(tmp.c_str(), sel - 1);
+	citeLB->insertItem(toqstr(tmp), sel - 1);
 	citeLB->setSelected(sel - 1, true);
 	form_->citekeys.insert(it - 1, tmp);
 	form_->setCiteButtons(QCitation::ON);
 	form_->changed();
+	form_->fillStyles();
 }
 
 
@@ -231,11 +232,12 @@ void QCitationDialog::slotDownClicked()
 	citeLB->removeItem(sel);
 	form_->citekeys.erase(it);
 
-	citeLB->insertItem(tmp.c_str(), sel + 1);
+	citeLB->insertItem(toqstr(tmp), sel + 1);
 	citeLB->setSelected(sel + 1, true);
 	form_->citekeys.insert(it + 1, tmp);
 	form_->setCiteButtons(QCitation::ON);
 	form_->changed();
+	form_->fillStyles();
 }
 
 
@@ -260,7 +262,7 @@ void QCitationDialog::changed_adaptor()
 void QCitationDialog::doFind(biblio::Direction dir)
 {
 	biblio::InfoMap const & theMap = form_->controller().bibkeysInfo();
-	string const str = searchED->text().latin1();
+	string const str = fromqstr(searchED->text());
 
 	biblio::Search const type =
 		searchTypeCB->isChecked() ?
@@ -306,5 +308,5 @@ void QCitationDialog::doFind(biblio::Direction dir)
 	int const top = max(found - 5, 1);
 	bibLB->setTopItem(top);
 	bibLB->setSelected(found, true);
-	slotBibHighlighted(0);
+	slotBibHighlighted(found);
 }