gnome-specimen r222 - in trunk: . data specimen

[wbolster svn gnome org]

Author: wbolster
Date: Tue Jul 15 13:59:21 2008
New Revision: 222
URL: http://svn.gnome.org/viewvc/gnome-specimen?rev=222&view=rev

Log:
Add support for non-integer font sizes

The font preview size is now a float value with one decimal,
allowing font sizes like 11.5 to be selected. The GConf
schema has been updated to reflect this change as well.
Fixes bug #203488.


Modified:
   trunk/   (props changed)
   trunk/data/gnome-specimen.glade
   trunk/data/gnome-specimen.schemas.in
   trunk/specimen/specimenwindow.py

Modified: trunk/data/gnome-specimen.glade
==============================================================================
--- trunk/data/gnome-specimen.glade	(original)
+++ trunk/data/gnome-specimen.glade	Tue Jul 15 13:59:21 2008
@@ -253,10 +253,11 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="tooltip" translatable="yes">Font size used for the previews</property>
-                        <property name="max_length">3</property>
+                        <property name="max_length">6</property>
                         <property name="width_chars">3</property>
                         <property name="adjustment">16 1 144 1 10 10</property>
                         <property name="climb_rate">1</property>
+                        <property name="digits">1</property>
                         <property name="numeric">True</property>
                         <property name="update_policy">GTK_UPDATE_IF_VALID</property>
                         <signal name="value_changed" handler="on_preview_size_changed"/>

Modified: trunk/data/gnome-specimen.schemas.in
==============================================================================
--- trunk/data/gnome-specimen.schemas.in	(original)
+++ trunk/data/gnome-specimen.schemas.in	Tue Jul 15 13:59:21 2008
@@ -15,8 +15,8 @@
 			<key>/schemas/apps/gnome-specimen/preview_size</key>
 			<applyto>/apps/gnome-specimen/preview_size</applyto>
 			<owner>gnome-specimen</owner>
-			<type>int</type>
-			<default>12</default>
+			<type>float</type>
+			<default>12.0</default>
 			<locale name="C">
 				<short>Preview font size</short>
 				<long>The font size used for the font previews</long>

Modified: trunk/specimen/specimenwindow.py
==============================================================================
--- trunk/specimen/specimenwindow.py	(original)
+++ trunk/specimen/specimenwindow.py	Tue Jul 15 13:59:21 2008
@@ -125,7 +125,7 @@
         'Quits the application'
 
         # Store current values in GConf
-        self.gconf_client.set_int(self.gconf_path_preview_size, self.preview_size)
+        self.gconf_client.set_float(self.gconf_path_preview_size, self.preview_size)
         if self.preview_text.strip() == '': # reset to default:
             self.gconf_client.unset(self.gconf_path_preview_text)
         else:
@@ -512,7 +512,7 @@
         font_description = face.describe()
         attrs = pango.AttrList()
         attrs.insert(pango.AttrFontDesc(font_description, 0, -1))
-        attrs.insert(pango.AttrSize(self.preview_size * pango.SCALE, 0, -1))
+        attrs.insert(pango.AttrSize(int(self.preview_size * pango.SCALE), 0, -1))
         attrs.insert(pango.AttrForeground(
             self.preview_fgcolor.red,
             self.preview_fgcolor.green,
@@ -584,7 +584,7 @@
 
     def on_preview_size_changed(self, widget, user_data=None):
         'Callback for changed preview point size'
-        self.preview_size = int(widget.get_value_as_int())
+        self.preview_size = float(widget.get_value())
         self.schedule_update_previews()
 
     def on_preview_text_changed(self, widget, user_data=None):
@@ -751,7 +751,7 @@
             self.preview_text_entry.set_text(self.preview_text)
         elif key_name == self.gconf_path_preview_size:
             # Don't bother going the hard way for the size :)
-            size = self.gconf_client.get_int(self.gconf_path_preview_size)
+            size = self.gconf_client.get_float(self.gconf_path_preview_size)
             if size > 0:
                 self.preview_size = size
             self.preview_size_spinbutton.set_value(self.preview_size)