Properly support the cite engines in the GUI

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

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index a7b4af5c04491a202db9a90474b26572f8abd6cf..10c91670afbb4a6985973102aa4015c7f976e89f 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -97,15 +97,11 @@ GuiCitation::GuiCitation(GuiView & lv)
 
        // The filter bar
        filter_ = new FancyLineEdit(this);
-#if QT_VERSION >= 0x040600
        filter_->setButtonPixmap(FancyLineEdit::Right, getPixmap("images/", "editclear", "svgz,png"));
        filter_->setButtonVisible(FancyLineEdit::Right, true);
        filter_->setButtonToolTip(FancyLineEdit::Right, qt_("Clear text"));
        filter_->setAutoHideButton(FancyLineEdit::Right, true);
-#endif
-#if QT_VERSION >= 0x040700
        filter_->setPlaceholderText(qt_("All avail. citations"));
-#endif
 
        filterBarL->addWidget(filter_, 0);
        findKeysLA->setBuddy(filter_);
@@ -117,6 +113,7 @@ GuiCitation::GuiCitation(GuiView & lv)
        casesense_->setCheckable(true);
        instant_ = new QAction(qt_("Search as you &type"), this);
        instant_->setCheckable(true);
+       instant_->setChecked(true);
 
        QMenu * searchOpts = new QMenu(this);
        searchOpts->addAction(regexp_);
@@ -307,7 +304,8 @@ void GuiCitation::updateStyles(BiblioInfo const & bi)
        citationStyleCO->blockSignals(true);
 
        // save old index
-       int const oldIndex = citationStyleCO->currentIndex();
+       int const curindex = citationStyleCO->currentIndex();
+       int const oldIndex = (curindex < 0) ? style_ : curindex;
        citationStyleCO->clear();
        citationStyleCO->insertItems(0, sty);
        citationStyleCO->setEnabled(true);
@@ -822,6 +820,8 @@ void GuiCitation::saveSession() const
                sessionKey() + "/casesensitive", casesense_->isChecked());
        settings.setValue(
                sessionKey() + "/autofind", instant_->isChecked());
+       settings.setValue(
+               sessionKey() + "/citestyle", style_);
 }
 
 
@@ -832,6 +832,7 @@ void GuiCitation::restoreSession()
        regexp_->setChecked(settings.value(sessionKey() + "/regex").toBool());
        casesense_->setChecked(settings.value(sessionKey() + "/casesensitive").toBool());
        instant_->setChecked(settings.value(sessionKey() + "/autofind").toBool());
+       style_ = settings.value(sessionKey() + "/citestyle").toInt();
        updateFilterHint();
 }