From 088059724dd76739b42b73a65f5a0ceee68afb97 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Sun, 8 Aug 2010 20:32:26 +0000
Subject: [PATCH] Remove DPI from preference dialog. The variable is kept in
 LyXRC, since we do need the value in the code. If this is a problem, I can
 define some QApplication::getDPI() and give up configurability altogether.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35095 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiPrefs.cpp            |   6 +-
 src/frontends/qt4/ui/PrefScreenFontsUi.ui | 330 ++++++++++------------
 2 files changed, 148 insertions(+), 188 deletions(-)

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index fd66d384c1..932d0c1ad6 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -900,8 +900,6 @@ PrefScreenFonts::PrefScreenFonts(GuiPreferences * form)
 		this, SIGNAL(changed()));
 	connect(screenZoomSB, SIGNAL(valueChanged(int)),
 		this, SIGNAL(changed()));
-	connect(screenDpiSB, SIGNAL(valueChanged(int)),
-		this, SIGNAL(changed()));
 	connect(screenTinyED, SIGNAL(textChanged(QString)),
 		this, SIGNAL(changed()));
 	connect(screenSmallestED, SIGNAL(textChanged(QString)),
@@ -950,7 +948,6 @@ void PrefScreenFonts::apply(LyXRC & rc) const
 		rc.typewriter_font_name, rc.typewriter_font_foundry);
 
 	rc.zoom = screenZoomSB->value();
-	rc.dpi = screenDpiSB->value();
 	rc.font_sizes[FONT_SIZE_TINY] = widgetToDoubleStr(screenTinyED);
 	rc.font_sizes[FONT_SIZE_SCRIPT] = widgetToDoubleStr(screenSmallestED);
 	rc.font_sizes[FONT_SIZE_FOOTNOTE] = widgetToDoubleStr(screenSmallerED);
@@ -967,7 +964,7 @@ void PrefScreenFonts::apply(LyXRC & rc) const
 		|| rc.roman_font_name != oldrc.roman_font_name
 		|| rc.sans_font_name != oldrc.sans_font_name
 		|| rc.typewriter_font_name != oldrc.typewriter_font_name
-		|| rc.zoom != oldrc.zoom || rc.dpi != oldrc.dpi) {
+		|| rc.zoom != oldrc.zoom) {
 		// The global QPixmapCache is used in GuiPainter to cache text
 		// painting so we must reset it in case any of the above
 		// parameter is changed.
@@ -992,7 +989,6 @@ void PrefScreenFonts::update(LyXRC const & rc)
 	selectTypewriter(screenTypewriterCO->currentText());
 
 	screenZoomSB->setValue(rc.zoom);
-	screenDpiSB->setValue(rc.dpi);
 	doubleToWidget(screenTinyED, rc.font_sizes[FONT_SIZE_TINY]);
 	doubleToWidget(screenSmallestED, rc.font_sizes[FONT_SIZE_SCRIPT]);
 	doubleToWidget(screenSmallerED, rc.font_sizes[FONT_SIZE_FOOTNOTE]);
diff --git a/src/frontends/qt4/ui/PrefScreenFontsUi.ui b/src/frontends/qt4/ui/PrefScreenFontsUi.ui
index df7bdead0a..2432cf0a3b 100644
--- a/src/frontends/qt4/ui/PrefScreenFontsUi.ui
+++ b/src/frontends/qt4/ui/PrefScreenFontsUi.ui
@@ -1,53 +1,41 @@
-<ui version="4.0">
+<ui version="4.0" >
  <class>PrefScreenFontsUi</class>
- <widget class="QWidget" name="PrefScreenFontsUi">
-  <property name="geometry">
+ <widget class="QWidget" name="PrefScreenFontsUi" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>288</width>
-    <height>355</height>
+    <width>359</width>
+    <height>454</height>
    </rect>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <layout class="QHBoxLayout" >
      <item>
-      <layout class="QGridLayout">
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <item row="1" column="1">
-        <widget class="QComboBox" name="screenSansCO">
-         <property name="maxVisibleItems">
+      <layout class="QGridLayout" >
+       <item row="1" column="1" >
+        <widget class="QComboBox" name="screenSansCO" >
+         <property name="maxVisibleItems" >
           <number>20</number>
          </property>
-         <property name="duplicatesEnabled">
+         <property name="duplicatesEnabled" >
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="1" column="2">
-        <widget class="GuiFontExample" name="screenSansFE" native="true">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <item row="1" column="2" >
+        <widget class="GuiFontExample" native="1" name="screenSansFE" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize">
+         <property name="minimumSize" >
           <size>
            <width>60</width>
            <height>0</height>
@@ -55,25 +43,25 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="screenSansLA">
-         <property name="text">
+       <item row="1" column="0" >
+        <widget class="QLabel" name="screenSansLA" >
+         <property name="text" >
           <string>Sans Seri&amp;f:</string>
          </property>
-         <property name="buddy">
+         <property name="buddy" >
           <cstring>screenSansCO</cstring>
          </property>
         </widget>
        </item>
-       <item row="0" column="2">
-        <widget class="GuiFontExample" name="screenRomanFE" native="true">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <item row="0" column="2" >
+        <widget class="GuiFontExample" native="1" name="screenRomanFE" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize">
+         <property name="minimumSize" >
           <size>
            <width>60</width>
            <height>0</height>
@@ -81,52 +69,52 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QComboBox" name="screenRomanCO">
-         <property name="maxVisibleItems">
+       <item row="0" column="1" >
+        <widget class="QComboBox" name="screenRomanCO" >
+         <property name="maxVisibleItems" >
           <number>20</number>
          </property>
-         <property name="duplicatesEnabled">
+         <property name="duplicatesEnabled" >
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="screenTypewriterLA">
-         <property name="text">
+       <item row="2" column="0" >
+        <widget class="QLabel" name="screenTypewriterLA" >
+         <property name="text" >
           <string>T&amp;ypewriter:</string>
          </property>
-         <property name="buddy">
+         <property name="buddy" >
           <cstring>screenTypewriterCO</cstring>
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="screenRomanLA">
-         <property name="text">
+       <item row="0" column="0" >
+        <widget class="QLabel" name="screenRomanLA" >
+         <property name="text" >
           <string>R&amp;oman:</string>
          </property>
-         <property name="buddy">
+         <property name="buddy" >
           <cstring>screenRomanCO</cstring>
          </property>
         </widget>
        </item>
-       <item row="2" column="2">
-        <widget class="GuiFontExample" name="screenTypewriterFE" native="true">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <item row="2" column="2" >
+        <widget class="GuiFontExample" native="1" name="screenTypewriterFE" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QComboBox" name="screenTypewriterCO">
-         <property name="maxVisibleItems">
+       <item row="2" column="1" >
+        <widget class="QComboBox" name="screenTypewriterCO" >
+         <property name="maxVisibleItems" >
           <number>20</number>
          </property>
-         <property name="duplicatesEnabled">
+         <property name="duplicatesEnabled" >
           <bool>false</bool>
          </property>
         </widget>
@@ -135,52 +123,23 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" >
      <item>
-      <layout class="QGridLayout">
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <item row="1" column="0">
-        <widget class="QLabel" name="scrrenDpiLA">
-         <property name="text">
-          <string>Screen &amp;DPI:</string>
-         </property>
-         <property name="buddy">
-          <cstring>screenDpiSB</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QSpinBox" name="screenDpiSB">
-         <property name="maximum">
-          <number>999</number>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="screenZoomLA">
-         <property name="text">
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="screenZoomLA" >
+         <property name="text" >
           <string>&amp;Zoom %:</string>
          </property>
-         <property name="buddy">
+         <property name="buddy" >
           <cstring>screenZoomSB</cstring>
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QSpinBox" name="screenZoomSB">
-         <property name="maximum">
+       <item row="0" column="1" >
+        <widget class="QSpinBox" name="screenZoomSB" >
+         <property name="maximum" >
           <number>999</number>
          </property>
         </widget>
@@ -189,13 +148,13 @@
      </item>
      <item>
       <spacer>
-       <property name="orientation">
+       <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType">
+       <property name="sizeType" >
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" stdset="0">
+       <property name="sizeHint" >
         <size>
          <width>20</width>
          <height>20</height>
@@ -205,144 +164,150 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <widget class="QGroupBox" name="GroupBox3">
-     <property name="title">
+   <item row="2" column="0" >
+    <widget class="QGroupBox" name="GroupBox3" >
+     <property name="title" >
       <string>Font Sizes</string>
      </property>
-     <layout class="QGridLayout">
-      <property name="margin">
+     <layout class="QGridLayout" >
+      <property name="leftMargin" >
        <number>11</number>
       </property>
-      <property name="spacing">
-       <number>6</number>
+      <property name="topMargin" >
+       <number>11</number>
+      </property>
+      <property name="rightMargin" >
+       <number>11</number>
+      </property>
+      <property name="bottomMargin" >
+       <number>11</number>
       </property>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="screenTinyED"/>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="screenTinyED" />
       </item>
-      <item row="4" column="3">
-       <widget class="QLineEdit" name="screenHugerED"/>
+      <item row="4" column="3" >
+       <widget class="QLineEdit" name="screenHugerED" />
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="screenSmallestED"/>
+      <item row="1" column="1" >
+       <widget class="QLineEdit" name="screenSmallestED" />
       </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="screenSmallerED"/>
+      <item row="2" column="1" >
+       <widget class="QLineEdit" name="screenSmallerED" />
       </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="screenSmallED"/>
+      <item row="3" column="1" >
+       <widget class="QLineEdit" name="screenSmallED" />
       </item>
-      <item row="4" column="1">
-       <widget class="QLineEdit" name="screenNormalED"/>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="screenNormalED" />
       </item>
-      <item row="0" column="3">
-       <widget class="QLineEdit" name="screenLargeED"/>
+      <item row="0" column="3" >
+       <widget class="QLineEdit" name="screenLargeED" />
       </item>
-      <item row="1" column="3">
-       <widget class="QLineEdit" name="screenLargerED"/>
+      <item row="1" column="3" >
+       <widget class="QLineEdit" name="screenLargerED" />
       </item>
-      <item row="2" column="3">
-       <widget class="QLineEdit" name="screenLargestED"/>
+      <item row="2" column="3" >
+       <widget class="QLineEdit" name="screenLargestED" />
       </item>
-      <item row="0" column="2">
-       <widget class="QLabel" name="screenLargeLA">
-        <property name="text">
+      <item row="0" column="2" >
+       <widget class="QLabel" name="screenLargeLA" >
+        <property name="text" >
          <string>&amp;Large:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>screenLargeED</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="screenLargerLA">
-        <property name="text">
+      <item row="1" column="2" >
+       <widget class="QLabel" name="screenLargerLA" >
+        <property name="text" >
          <string>&amp;Larger:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>screenLargerED</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QLabel" name="screenLargestLA">
-        <property name="text">
+      <item row="2" column="2" >
+       <widget class="QLabel" name="screenLargestLA" >
+        <property name="text" >
          <string>&amp;Largest:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>screenLargestED</cstring>
         </property>
        </widget>
       </item>
-      <item row="3" column="3">
-       <widget class="QLineEdit" name="screenHugeED"/>
+      <item row="3" column="3" >
+       <widget class="QLineEdit" name="screenHugeED" />
       </item>
-      <item row="3" column="2">
-       <widget class="QLabel" name="screenHugeLA">
-        <property name="text">
+      <item row="3" column="2" >
+       <widget class="QLabel" name="screenHugeLA" >
+        <property name="text" >
          <string>&amp;Huge:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>screenHugeED</cstring>
         </property>
        </widget>
       </item>
-      <item row="4" column="2">
-       <widget class="QLabel" name="screenHugestLA">
-        <property name="text">
+      <item row="4" column="2" >
+       <widget class="QLabel" name="screenHugestLA" >
+        <property name="text" >
          <string>&amp;Hugest:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>screenHugerED</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="screenSmallestLA">
-        <property name="text">
+      <item row="1" column="0" >
+       <widget class="QLabel" name="screenSmallestLA" >
+        <property name="text" >
          <string>S&amp;mallest:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>screenSmallestED</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="screenSmallerLA">
-        <property name="text">
+      <item row="2" column="0" >
+       <widget class="QLabel" name="screenSmallerLA" >
+        <property name="text" >
          <string>S&amp;maller:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>screenSmallerED</cstring>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="screenSmallLA">
-        <property name="text">
+      <item row="3" column="0" >
+       <widget class="QLabel" name="screenSmallLA" >
+        <property name="text" >
          <string>S&amp;mall:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>screenSmallED</cstring>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="screenNormalLA">
-        <property name="text">
+      <item row="4" column="0" >
+       <widget class="QLabel" name="screenNormalLA" >
+        <property name="text" >
          <string>&amp;Normal:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>screenNormalED</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="screenTinyLA">
-        <property name="text">
+      <item row="0" column="0" >
+       <widget class="QLabel" name="screenTinyLA" >
+        <property name="text" >
          <string>&amp;Tiny:</string>
         </property>
-        <property name="buddy">
+        <property name="buddy" >
          <cstring>screenTinyED</cstring>
         </property>
        </widget>
@@ -350,12 +315,12 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="1">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
+   <item row="2" column="1" >
+    <spacer>
+     <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0">
+     <property name="sizeHint" >
       <size>
        <width>40</width>
        <height>20</height>
@@ -363,22 +328,22 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="0">
-    <widget class="QCheckBox" name="pixmapCacheCB">
-     <property name="toolTip">
+   <item row="3" column="0" >
+    <widget class="QCheckBox" name="pixmapCacheCB" >
+     <property name="toolTip" >
       <string>Checking this improves performance, but might decrease the on-screen quality of fonts</string>
      </property>
-     <property name="text">
+     <property name="text" >
       <string>&amp;Use pixmap cache to speed up font rendering</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
+   <item row="4" column="0" >
+    <spacer>
+     <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0">
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>6</height>
@@ -400,7 +365,6 @@
   <tabstop>screenSansCO</tabstop>
   <tabstop>screenTypewriterCO</tabstop>
   <tabstop>screenZoomSB</tabstop>
-  <tabstop>screenDpiSB</tabstop>
   <tabstop>screenTinyED</tabstop>
   <tabstop>screenSmallestED</tabstop>
   <tabstop>screenSmallerED</tabstop>
@@ -413,7 +377,7 @@
   <tabstop>screenHugerED</tabstop>
  </tabstops>
  <includes>
-  <include location="local">qt_i18n.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>
-- 
2.39.2