* move the Pixmap Cache check box where it belongs: screen fonts

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

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index ee5c28ab3870d261f7e5eb93f3c3f01005132e49..0e923ec50c0ec480bcc564f0e153f13fb5e5a375 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -437,6 +437,8 @@ PrefScreenFonts::PrefScreenFonts(GuiPreferences * form, QWidget * parent)
                this, SIGNAL(changed()));
        connect(screenHugerED, SIGNAL(textChanged(QString)),
                this, SIGNAL(changed()));
+       connect(pixmapCacheCB, SIGNAL(toggled(bool)),
+               this, SIGNAL(changed()));
 
        screenTinyED->setValidator(new QDoubleValidator(screenTinyED));
        screenSmallestED->setValidator(new QDoubleValidator(screenSmallestED));
@@ -474,6 +476,7 @@ void PrefScreenFonts::apply(LyXRC & rc) const
        rc.font_sizes[FONT_SIZE_LARGEST] = fromqstr(screenLargestED->text());
        rc.font_sizes[FONT_SIZE_HUGE] = fromqstr(screenHugeED->text());
        rc.font_sizes[FONT_SIZE_HUGER] = fromqstr(screenHugerED->text());
+       rc.use_pixmap_cache = pixmapCacheCB->isChecked();
 
        if (rc.font_sizes != oldrc.font_sizes
                || rc.roman_font_name != oldrc.roman_font_name
@@ -515,6 +518,12 @@ void PrefScreenFonts::update(LyXRC const & rc)
        screenLargestED->setText(toqstr(rc.font_sizes[FONT_SIZE_LARGEST]));
        screenHugeED->setText(toqstr(rc.font_sizes[FONT_SIZE_HUGE]));
        screenHugerED->setText(toqstr(rc.font_sizes[FONT_SIZE_HUGER]));
+
+       pixmapCacheCB->setChecked(rc.use_pixmap_cache);
+#if defined(Q_WS_X11)
+       pixmapCacheGB->setEnabled(false);
+#endif
+       
 }
 
 
@@ -1631,8 +1640,6 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form, QWidget * parent)
                this, SIGNAL(changed()));
        connect(tooltipCB, SIGNAL(toggled(bool)),
                this, SIGNAL(changed()));
-       connect(pixmapCacheCB, SIGNAL(toggled(bool)),
-               this, SIGNAL(changed()));
        lastfilesSB->setMaximum(maxlastfiles);
 }
 
@@ -1654,7 +1661,6 @@ void PrefUserInterface::apply(LyXRC & rc) const
        rc.make_backup = autoSaveCB->isChecked();
        rc.num_lastfiles = lastfilesSB->value();
        rc.use_tooltip = tooltipCB->isChecked();
-       rc.use_pixmap_cache = pixmapCacheCB->isChecked();
 }
 
 
@@ -1675,10 +1681,6 @@ void PrefUserInterface::update(LyXRC const & rc)
        autoSaveCB->setChecked(rc.make_backup);
        lastfilesSB->setValue(rc.num_lastfiles);
        tooltipCB->setChecked(rc.use_tooltip);
-       pixmapCacheCB->setChecked(rc.use_pixmap_cache);
-#if defined(Q_WS_X11)
-       pixmapCacheGB->setEnabled(false);
-#endif
 }
 
 

diff --git a/src/frontends/qt4/ui/PrefScreenFontsUi.ui b/src/frontends/qt4/ui/PrefScreenFontsUi.ui
index 5a23fdc17a40705e70530b18e6a5c03bd1b7d05a..d94627af674de09f897e318edaecb3f89a796876 100644 (file)
--- a/src/frontends/qt4/ui/PrefScreenFontsUi.ui
+++ b/src/frontends/qt4/ui/PrefScreenFontsUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>342</width>
-    <height>365</height>
+    <width>371</width>
+    <height>482</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -353,6 +353,13 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="pixmapCacheCB" >
+     <property name="text" >
+      <string>Use Pixmap Cache to speed up font rendering</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <spacer>
      <property name="orientation" >

diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index 614eb8bcea2bc15d08183f4d5fb86d6dd65adfe5..3ed020782b277ecbe5e7f4f4f2d918644553964d 100644 (file)
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -128,40 +128,6 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3" >
-    <widget class="QGroupBox" name="pixmapCacheGB" >
-     <property name="title" >
-      <string>Pixmap Cache</string>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="flat" >
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="pixmapCacheCB" >
-        <property name="toolTip" >
-         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Checking this improves performance, but might decrease the on-screen quality of fonts.&lt;/p>&lt;/body>&lt;/html></string>
-        </property>
-        <property name="text" >
-         <string>Enable Pi&amp;xmap Cache</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="0" column="0" >
     <widget class="QLabel" name="uiFileLA" >
      <property name="text" >
@@ -346,7 +312,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>cursorFollowsCB</tabstop>
   <tabstop>sortEnvironmentsCB</tabstop>
   <tabstop>macroEditStyleCO</tabstop>
-  <tabstop>pixmapCacheCB</tabstop>
  </tabstops>
  <includes>
   <include location="local" >qt_helpers.h</include>