From 65cdd8a7dae1c8aea00e9bcd73837cdf40db90e0 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 9 Jan 2009 12:43:48 +0900
Subject: [PATCH] fix display properties, tweak wording

---
 ankiqt/ui/displayproperties.py |  9 ++--
 designer/displayproperties.ui  | 95 +++++++++++++++++++++++++++++++---
 2 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/ankiqt/ui/displayproperties.py b/ankiqt/ui/displayproperties.py
index e66f7fc02..5f603088a 100644
--- a/ankiqt/ui/displayproperties.py
+++ b/ankiqt/ui/displayproperties.py
@@ -209,26 +209,29 @@ class DisplayProperties(QDialog):
                 self.fwidget("useFamily", type).setCheckState(Qt.Checked)
                 self.fwidget("fontFamily", type).setCurrentFont(QFont(
                     getattr(field, type + 'FontFamily')))
+                self.fwidget("fontFamily", type).setEnabled(True)
             else:
                 self.fwidget("useFamily", type).setCheckState(Qt.Unchecked)
-                self.fwidget("fontFamily", type).hide()
+                self.fwidget("fontFamily", type).setEnabled(False)
             # size
             if getattr(field, type + 'FontSize'):
                 self.fwidget("useSize", type).setCheckState(Qt.Checked)
                 self.fwidget("fontSize", type).setValue(
                     getattr(field, type + 'FontSize'))
+                self.fwidget("fontSize", type).setEnabled(True)
             else:
                 self.fwidget("useSize", type).setCheckState(Qt.Unchecked)
-                self.fwidget("fontSize", type).hide()
+                self.fwidget("fontSize", type).setEnabled(False)
             # colour
             if type == "quiz":
                 if getattr(field, type + 'FontColour'):
                     self.fwidget("useColour", type).setCheckState(Qt.Checked)
                     self.fwidget("fontColour", type).setPalette(QPalette(QColor(
                         getattr(field, type + 'FontColour'))))
+                    self.fwidget("fontColour", type).setEnabled(True)
                 else:
                     self.fwidget("useColour", type).setCheckState(Qt.Unchecked)
-                    self.fwidget("fontColour", type).hide()
+                    self.fwidget("fontColour", type).setEnabled(False)
         self.currentField = field
 
     def saveField(self, *args):
diff --git a/designer/displayproperties.ui b/designer/displayproperties.ui
index 789533e51..0c1d45f5c 100644
--- a/designer/displayproperties.ui
+++ b/designer/displayproperties.ui
@@ -102,7 +102,7 @@
                 </rect>
                </property>
                <attribute name="title" >
-                <string>Card</string>
+                <string>Cards</string>
                </attribute>
                <layout class="QVBoxLayout" name="verticalLayout" >
                 <item>
@@ -272,7 +272,7 @@
                  <x>0</x>
                  <y>0</y>
                  <width>297</width>
-                 <height>437</height>
+                 <height>289</height>
                 </rect>
                </property>
                <attribute name="title" >
@@ -298,7 +298,7 @@
                 <item>
                  <widget class="QLabel" name="label" >
                   <property name="text" >
-                   <string> &lt;b>When quizzing/adding/editing&lt;/b></string>
+                   <string> &lt;b>When reviewing and editing:&lt;/b></string>
                   </property>
                  </widget>
                 </item>
@@ -366,6 +366,9 @@
                     <property name="maximum" >
                      <number>300</number>
                     </property>
+                    <property name="value" >
+                     <number>14</number>
+                    </property>
                    </widget>
                   </item>
                   <item row="2" column="0" >
@@ -405,7 +408,7 @@
                 <item>
                  <widget class="QLabel" name="label_2" >
                   <property name="text" >
-                   <string> &lt;b>When adding/editing&lt;/b></string>
+                   <string> &lt;b>When editing (overrides above):&lt;/b></string>
                   </property>
                  </widget>
                 </item>
@@ -601,8 +604,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>275</x>
-     <y>522</y>
+     <x>315</x>
+     <y>385</y>
     </hint>
     <hint type="destinationlabel" >
      <x>325</x>
@@ -610,5 +613,85 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>useFamily</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fontFamily</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>107</x>
+     <y>187</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>178</x>
+     <y>194</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>useSize</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fontSize</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>134</x>
+     <y>226</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>205</x>
+     <y>224</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>useColour</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fontColour</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>93</x>
+     <y>256</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>175</x>
+     <y>253</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>useFamilyEdit</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fontFamilyEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>122</x>
+     <y>299</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>215</x>
+     <y>301</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>useSizeEdit</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fontSizeEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>129</x>
+     <y>340</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>210</x>
+     <y>337</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>