Handle correctly zero table special arguments.

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

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 44e887e40907c785eeea8459c44d63200d17f793..46cdd8d36fd8f66a35ccd4cb6e3b6f899bbfff5b 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -27,6 +27,7 @@
 #include "TextClass.h"
 #include "FuncRequest.h"
 
+#include "insets/InsetCitation.h"
 #include "insets/InsetCommand.h"
 
 #include "support/debug.h"
@@ -188,7 +189,7 @@ void GuiCitation::closeEvent(QCloseEvent * e)
 void GuiCitation::applyView()
 {
        int const choice = max(0, citationStyleCO->currentIndex());
-       style_ = citationStyleCO->currentData().toString();
+       style_ = citationStyleCO->itemData(citationStyleCO->currentIndex()).toString();
        bool const full  = starredCB->isChecked();
        bool const force = forceuppercaseCB->isChecked();
 
@@ -232,12 +233,13 @@ void GuiCitation::on_restorePB_clicked()
 {
        init();
        updateFilterHint();
+       filterPressed();
 }
 
 
 void GuiCitation::on_literalCB_clicked()
 {
-       literal_ = literalCB->isChecked();
+       InsetCitation::last_literal = literalCB->isChecked();
        changed();
 }
 
@@ -311,10 +313,10 @@ void GuiCitation::updateFormatting(CitationStyle const & currentStyle)
 
        forceuppercaseCB->setEnabled(force && haveSelection);
        if (force && haveSelection)
-               forceuppercaseCB->setToolTip("Force upper case in names (\"Del Piero\", not \"del Piero\").");
+               forceuppercaseCB->setToolTip(qt_("Force upper case in names (\"Del Piero\", not \"del Piero\")."));
        else
-               forceuppercaseCB->setToolTip("Force upper case in names (\"Del Piero\", not \"del Piero\"), "
-                                            "if the current citation style supports this.");
+               forceuppercaseCB->setToolTip(qt_("Force upper case in names (\"Del Piero\", not \"del Piero\"), "
+                                            "if the current citation style supports this."));
        starredCB->setEnabled(full && haveSelection);
        textBeforeED->setEnabled(textbefore && haveSelection);
        textBeforeLA->setEnabled(textbefore && haveSelection);
@@ -392,7 +394,8 @@ void GuiCitation::updateStyles(BiblioInfo const & bi)
        citationStyleCO->blockSignals(true);
 
        // save old style selection
-       QString const curdata = citationStyleCO->currentData().toString();
+       QString const curdata =
+               citationStyleCO->itemData(citationStyleCO->currentIndex()).toString();
        QString const olddata = (curdata.isEmpty()) ? style_ : curdata;
        citationStyleCO->clear();
        BiblioInfo::CiteStringMap::const_iterator cit = sty.begin();
@@ -767,7 +770,7 @@ void GuiCitation::init()
        // if this is a new citation, we set the literal checkbox
        // to its last set value.
        if (cited_keys_.isEmpty())
-               literalCB->setChecked(literal_);
+               literalCB->setChecked(InsetCitation::last_literal);
        else
                literalCB->setChecked(params_["literal"] == "true");
 
@@ -1048,10 +1051,9 @@ BiblioInfo const & GuiCitation::bibInfo() const
 }
 
 
-void GuiCitation::saveSession() const
+void GuiCitation::saveSession(QSettings & settings) const
 {
-       Dialog::saveSession();
-       QSettings settings;
+       Dialog::saveSession(settings);
        settings.setValue(
                sessionKey() + "/regex", regexp_->isChecked());
        settings.setValue(
@@ -1061,7 +1063,7 @@ void GuiCitation::saveSession() const
        settings.setValue(
                sessionKey() + "/citestyle", style_);
        settings.setValue(
-               sessionKey() + "/literal", literal_);
+               sessionKey() + "/literal", InsetCitation::last_literal);
 }
 
 
@@ -1073,7 +1075,8 @@ void GuiCitation::restoreSession()
        casesense_->setChecked(settings.value(sessionKey() + "/casesensitive").toBool());
        instant_->setChecked(settings.value(sessionKey() + "/autofind", true).toBool());
        style_ = settings.value(sessionKey() + "/citestyle").toString();
-       literal_ = settings.value(sessionKey() + "/literal", false).toBool();
+       InsetCitation::last_literal = 
+               settings.value(sessionKey() + "/literal", false).toBool();
        updateFilterHint();
 }