header cleanup

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

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 0e923ec50c0ec480bcc564f0e153f13fb5e5a375..290089b3f1bf080d999dfbfe5710e1b5510905e3 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -56,7 +56,6 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 #include <QValidator>
-#include <QCloseEvent>
 
 #include <iomanip>
 #include <sstream>
@@ -246,12 +245,12 @@ void PrefDate::update(LyXRC const & rc)
 
 /////////////////////////////////////////////////////////////////////
 //
-// PrefKeyboard
+// PrefInput
 //
 /////////////////////////////////////////////////////////////////////
 
-PrefKeyboard::PrefKeyboard(GuiPreferences * form, QWidget * parent)
-       : PrefModule(_("Keyboard"), form, parent)
+PrefInput::PrefInput(GuiPreferences * form, QWidget * parent)
+       : PrefModule(_("Keyboard/Mouse"), form, parent)
 {
        setupUi(this);
 
@@ -261,34 +260,38 @@ PrefKeyboard::PrefKeyboard(GuiPreferences * form, QWidget * parent)
                this, SIGNAL(changed()));
        connect(secondKeymapED, SIGNAL(textChanged(QString)),
                this, SIGNAL(changed()));
+       connect(mouseWheelSpeedSB, SIGNAL(valueChanged(double)),
+               this, SIGNAL(changed()));
 }
 
 
-void PrefKeyboard::apply(LyXRC & rc) const
+void PrefInput::apply(LyXRC & rc) const
 {
        // FIXME: can derive CB from the two EDs
        rc.use_kbmap = keymapCB->isChecked();
        rc.primary_kbmap = internal_path(fromqstr(firstKeymapED->text()));
        rc.secondary_kbmap = internal_path(fromqstr(secondKeymapED->text()));
+       rc.mouse_wheel_speed = mouseWheelSpeedSB->value();
 }
 
 
-void PrefKeyboard::update(LyXRC const & rc)
+void PrefInput::update(LyXRC const & rc)
 {
        // FIXME: can derive CB from the two EDs
        keymapCB->setChecked(rc.use_kbmap);
        firstKeymapED->setText(toqstr(external_path(rc.primary_kbmap)));
        secondKeymapED->setText(toqstr(external_path(rc.secondary_kbmap)));
+       mouseWheelSpeedSB->setValue(rc.mouse_wheel_speed);
 }
 
 
-QString PrefKeyboard::testKeymap(QString keymap)
+QString PrefInput::testKeymap(QString keymap)
 {
        return toqstr(form_->browsekbmap(from_utf8(internal_path(fromqstr(keymap)))));
 }
 
 
-void PrefKeyboard::on_firstKeymapPB_clicked(bool)
+void PrefInput::on_firstKeymapPB_clicked(bool)
 {
        QString const file = testKeymap(firstKeymapED->text());
        if (!file.isEmpty())
@@ -296,7 +299,7 @@ void PrefKeyboard::on_firstKeymapPB_clicked(bool)
 }
 
 
-void PrefKeyboard::on_secondKeymapPB_clicked(bool)
+void PrefInput::on_secondKeymapPB_clicked(bool)
 {
        QString const file = testKeymap(secondKeymapED->text());
        if (!file.isEmpty())
@@ -304,7 +307,7 @@ void PrefKeyboard::on_secondKeymapPB_clicked(bool)
 }
 
 
-void PrefKeyboard::on_keymapCB_toggled(bool keymap)
+void PrefInput::on_keymapCB_toggled(bool keymap)
 {
        firstKeymapLA->setEnabled(keymap);
        secondKeymapLA->setEnabled(keymap);
@@ -521,7 +524,7 @@ void PrefScreenFonts::update(LyXRC const & rc)
 
        pixmapCacheCB->setChecked(rc.use_pixmap_cache);
 #if defined(Q_WS_X11)
-       pixmapCacheGB->setEnabled(false);
+       pixmapCacheCB->setEnabled(false);
 #endif
        
 }
@@ -1434,7 +1437,11 @@ PrefLanguage::PrefLanguage(QWidget * parent)
 {
        setupUi(this);
 
-       connect(rtlCB, SIGNAL(clicked()),
+       connect(rtlGB, SIGNAL(clicked()),
+               this, SIGNAL(changed()));
+       connect(visualCursorRB, SIGNAL(clicked()),
+               this, SIGNAL(changed()));
+       connect(logicalCursorRB, SIGNAL(clicked()),
                this, SIGNAL(changed()));
        connect(markForeignCB, SIGNAL(clicked()),
                this, SIGNAL(changed()));
@@ -1472,7 +1479,8 @@ PrefLanguage::PrefLanguage(QWidget * parent)
 void PrefLanguage::apply(LyXRC & rc) const
 {
        // FIXME: remove rtl_support bool
-       rc.rtl_support = rtlCB->isChecked();
+       rc.rtl_support = rtlGB->isChecked();
+       rc.visual_cursor = rtlGB->isChecked() && visualCursorRB->isChecked();
        rc.mark_foreign_language = markForeignCB->isChecked();
        rc.language_auto_begin = autoBeginCB->isChecked();
        rc.language_auto_end = autoEndCB->isChecked();
@@ -1488,7 +1496,11 @@ void PrefLanguage::apply(LyXRC & rc) const
 void PrefLanguage::update(LyXRC const & rc)
 {
        // FIXME: remove rtl_support bool
-       rtlCB->setChecked(rc.rtl_support);
+       rtlGB->setChecked(rc.rtl_support);
+       if (rc.visual_cursor)
+               visualCursorRB->setChecked(true);
+       else
+               logicalCursorRB->setChecked(true);
        markForeignCB->setChecked(rc.mark_foreign_language);
        autoBeginCB->setChecked(rc.language_auto_begin);
        autoEndCB->setChecked(rc.language_auto_end);
@@ -2137,10 +2149,9 @@ void PrefIdentity::update(LyXRC const & rc)
 /////////////////////////////////////////////////////////////////////
 
 GuiPreferences::GuiPreferences(GuiView & lv)
-       : GuiDialog(lv, "prefs"), update_screen_font_(false)
+       : GuiDialog(lv, "prefs", qt_("Preferences")), update_screen_font_(false)
 {
        setupUi(this);
-       setViewTitle(_("Preferences"));
 
        QDialog::setModal(false);
 
@@ -2154,7 +2165,7 @@ GuiPreferences::GuiPreferences(GuiView & lv)
        add(new PrefScreenFonts(this));
        add(new PrefColors(this));
        add(new PrefDisplay);
-       add(new PrefKeyboard(this));
+       add(new PrefInput(this));
 
        add(new PrefPaths(this));
 
@@ -2199,13 +2210,6 @@ void GuiPreferences::add(PrefModule * module)
 }
 
 
-void GuiPreferences::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiPreferences::change_adaptor()
 {
        changed();