better selection and scrolling behaviour

[lyx.git] / src / frontends / qt2 / QPrefs.C

diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C
index 647024c0aac5b73d4f98082fdc4ad690ffb3af90..b93330ae050d1e348e33652704d9774b6247a678 100644 (file)
--- a/src/frontends/qt2/QPrefs.C
+++ b/src/frontends/qt2/QPrefs.C
@@ -39,8 +39,11 @@
 #include "lyxrc.h"
 #include "frnt_lang.h"
 #include "helper_funcs.h"
+#include "qt_helpers.h"
 #include "debug.h"
 
+#include <boost/tuple/tuple.hpp>
+
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
@@ -51,6 +54,7 @@
 #include "qcoloritem.h"
 
 using std::vector;
+using std::pair;
 using std::ostringstream;
 using std::setfill;
 using std::setw;
@@ -93,8 +97,6 @@ void QPrefs::apply()
 {
        LyXRC & rc(controller().rc());
 
-       // do something ...
-
        QPrefLanguageModule * langmod(dialog_->languageModule);
 
        // FIXME: remove rtl_support bool
@@ -231,9 +233,13 @@ void QPrefs::apply()
 
        LyXRC const oldrc(rc);
 
-       rc.roman_font_name = fontmod->screenRomanCO->currentText().latin1();
-       rc.sans_font_name = fontmod->screenSansCO->currentText().latin1();
-       rc.typewriter_font_name = fontmod->screenTypewriterCO->currentText().latin1();
+       boost::tie(rc.roman_font_name, rc.roman_font_foundry)
+               = parseFontName(fontmod->screenRomanCO->currentText().latin1());
+       boost::tie(rc.sans_font_name, rc.sans_font_foundry) =
+               parseFontName(fontmod->screenSansCO->currentText().latin1());
+       boost::tie(rc.typewriter_font_name, rc.typewriter_font_foundry) =
+               parseFontName(fontmod->screenTypewriterCO->currentText().latin1());
+
        rc.zoom = fontmod->screenZoomSB->value();
        rc.dpi = fontmod->screenDpiSB->value();
        rc.font_sizes[LyXFont::SIZE_TINY] = strToDbl(fontmod->screenTinyED->text().latin1());
@@ -299,6 +305,29 @@ findPos(std::vector<A> const & vec, A const & val)
        return std::distance(vec.begin(), it);
 }
 
+void setComboxFont(QComboBox * cb,
+                  string const & family, string const & foundry)
+{
+
+       string const name = makeFontName(family, foundry);
+       for (int i = 0; i < cb->count(); ++i) {
+               if (compare_no_case(cb->text(i).latin1(), name) == 0) {
+                       cb->setCurrentItem(i);
+                       return;
+               }
+       }
+
+       // Try matching without foundary name
+       for (int i = cb->count() - 1; i >= 0; --i) {
+               // We count in reverse in order to prefer the Xft foundry
+               pair<string, string> tmp = parseFontName(cb->text(i).latin1());
+               if (compare_no_case(tmp.first, family) == 0) {
+                       cb->setCurrentItem(i);
+                       return;
+               }
+       }
+}
+
 }
 
 void QPrefs::update_contents()
@@ -436,35 +465,16 @@ void QPrefs::update_contents()
 
        QPrefScreenFontsModule * fontmod(dialog_->screenfontsModule);
 
-       QString roman(rc.roman_font_name.c_str());
-       QString sans(rc.sans_font_name.c_str());
-       QString typewriter(rc.typewriter_font_name.c_str());
-
-       for (int i = 0; i < fontmod->screenRomanCO->count(); ++i) {
-               if (fontmod->screenRomanCO->text(i) == roman) {
-                       fontmod->screenRomanCO->setCurrentItem(i);
-                       break;
-               }
-       }
-
-       for (int i = 0; i < fontmod->screenSansCO->count(); ++i) {
-               if (fontmod->screenSansCO->text(i) == sans) {
-                       fontmod->screenSansCO->setCurrentItem(i);
-                       break;
-               }
-       }
-
-       for (int i = 0; i < fontmod->screenTypewriterCO->count(); ++i) {
-               if (fontmod->screenTypewriterCO->text(i) == typewriter) {
-                       fontmod->screenTypewriterCO->setCurrentItem(i);
-                       break;
-               }
-       }
+       setComboxFont(fontmod->screenRomanCO,
+                     rc.roman_font_name, rc.roman_font_foundry);
+       setComboxFont(fontmod->screenSansCO,
+                     rc.sans_font_name, rc.sans_font_foundry);
+       setComboxFont(fontmod->screenTypewriterCO,
+                     rc.typewriter_font_name, rc.typewriter_font_foundry);
 
-       // Fucked if I know why we need this. But we do
-       dialog_->select_roman(roman);
-       dialog_->select_sans(sans);
-       dialog_->select_typewriter(typewriter);
+       dialog_->select_roman(fontmod->screenRomanCO->currentText());
+       dialog_->select_sans(fontmod->screenSansCO->currentText());
+       dialog_->select_typewriter(fontmod->screenTypewriterCO->currentText());
 
        fontmod->screenZoomSB->setValue(rc.zoom);
        fontmod->screenDpiSB->setValue(int(rc.dpi));