Fix bug http://www.lyx.org/trac/ticket/5307

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29751 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index da194a63cf4a8a97055e03704356bb80a3564bf8..6312d796f3bfcf0a1fec92cfa939003ec2b564de 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -525,6 +525,19 @@ PrefCompletion::PrefCompletion(GuiPreferences * form)
 }
 
 
+void PrefCompletion::on_inlineTextCB_clicked()
+{
+       on_popupTextCB_clicked();
+}
+
+
+void PrefCompletion::on_popupTextCB_clicked()
+{
+       cursorTextCB->setEnabled(
+               popupTextCB->isChecked() || inlineTextCB->isChecked());
+}
+
+
 void PrefCompletion::apply(LyXRC & rc) const
 {
        rc.completion_inline_delay = inlineDelaySB->value();
@@ -551,6 +564,7 @@ void PrefCompletion::update(LyXRC const & rc)
        popupTextCB->setChecked(rc.completion_popup_text);
        cursorTextCB->setChecked(rc.completion_cursor_text);
        popupAfterCompleteCB->setChecked(rc.completion_popup_after_complete);
+        on_popupTextCB_clicked();
 }
 
 

diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h
index 3e45906e32675c89f033522ba2be23e7f8fd1876..cdc2d2c2483a191fe40c1dd661b0e6b2156c32a0 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.h
+++ b/src/frontends/qt4/GuiPrefs.h
@@ -210,6 +210,9 @@ public:
 
        virtual void apply(LyXRC & rc) const;
        virtual void update(LyXRC const & rc);
+private Q_SLOTS:
+       void on_popupTextCB_clicked();
+       void on_inlineTextCB_clicked();
 };