Use QFontMetrics information for underlines (and friends) width and position

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

diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 500d228b4a4fbcfa5e0dc7fed6276fcc2d9afd14..483c8fb5b128e86ffee2ab1597476714fa82dffe 100644 (file)
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -145,7 +145,7 @@ void GuiCitation::applyView()
        QString const before = textBeforeED->text();
        QString const after = textAfterED->text();
 
-       apply(choice, full, force, before, after);
+       applyParams(choice, full, force, before, after);
 }
 
 
@@ -157,6 +157,17 @@ void GuiCitation::showEvent(QShowEvent * e)
 }
 
 
+void GuiCitation::on_citationTB_currentChanged(int i)
+{
+       if (i == 0)
+               findLE->setFocus();
+       else if (citationStyleCO->isEnabled())
+               citationStyleCO->setFocus();
+       else
+               textAfterED->setFocus();
+}
+
+
 void GuiCitation::on_okPB_clicked()
 {
        applyView();
@@ -443,7 +454,7 @@ void GuiCitation::changed()
 }
 
 
-void GuiCitation::apply(int const choice, bool full, bool force,
+void GuiCitation::applyParams(int const choice, bool full, bool force,
        QString before, QString after)
 {
        if (cited_keys_.isEmpty())